[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53079] trunk/blender/source/blender: missed adding show_grease_pencil to node space in recent commit

Campbell Barton ideasman42 at gmail.com
Mon Dec 17 10:17:24 CET 2012


Revision: 53079
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53079
Author:   campbellbarton
Date:     2012-12-17 09:17:21 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
missed adding show_grease_pencil to node space in recent commit

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_space.c
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2012-12-17 09:02:43 UTC (rev 53078)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2012-12-17 09:17:21 UTC (rev 53079)
@@ -3048,6 +3048,12 @@
 	RNA_def_property_ui_text(prop, "Backdrop", "Use active Viewer Node output as backdrop for compositing nodes");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE_VIEW, NULL);
 
+	prop = RNA_def_property(srna, "show_grease_pencil", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", SNODE_SHOW_GPENCIL);
+	RNA_def_property_ui_text(prop, "Show Grease Pencil",
+	                         "Show grease pencil for this view");
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE_VIEW, NULL);
+
 	prop = RNA_def_property(srna, "use_auto_render", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SNODE_AUTO_RENDER);
 	RNA_def_property_ui_text(prop, "Auto Render", "Re-render and composite changed layers on 3D edits");

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2012-12-17 09:02:43 UTC (rev 53078)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2012-12-17 09:17:21 UTC (rev 53079)
@@ -6031,18 +6031,17 @@
 
 	/* add classmethods */
 	{
+		const PointerRNA func_ptr = {{NULL}, srna, NULL};
 		const ListBase *lb;
 		Link *link;
 
-		const PointerRNA func_ptr = {{NULL}, srna, NULL};
-
 		lb = RNA_struct_type_functions(srna);
 		for (link = lb->first; link; link = link->next) {
 			FunctionRNA *func = (FunctionRNA *)link;
 			const int flag = RNA_function_flag(func);
 			if ((flag & FUNC_NO_SELF) &&          /* is classmethod */
 			    (flag & FUNC_REGISTER) == FALSE)  /* is not for registration */
-			{  /* is not for registration */
+			{
 				/* we may went to set the type of this later */
 				PyObject *func_py = pyrna_func_to_py(&func_ptr, func);
 				PyObject_SetAttrString(newclass, RNA_function_identifier(func), func_py);




More information about the Bf-blender-cvs mailing list