missed adding show_grease_pencil to node space in recent commit
authorCampbell Barton <ideasman42@gmail.com>
Mon, 17 Dec 2012 09:17:21 +0000 (09:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 17 Dec 2012 09:17:21 +0000 (09:17 +0000)
source/blender/makesrna/intern/rna_space.c
source/blender/python/intern/bpy_rna.c

index f7475151e9de4cd3a99666d03bd32436d1203c57..6c084cdd898d97e734e15843a511514da9606dea 100644 (file)
@@ -3048,6 +3048,12 @@ static void rna_def_space_node(BlenderRNA *brna)
        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");
index fbdcc86c4258710ad17b86176bb472f2f1a81114..55983c7389572e70276fe1d621685767ad857279 100644 (file)
@@ -6031,18 +6031,17 @@ static void pyrna_subtype_set_rna(PyObject *newclass, StructRNA *srna)
 
        /* 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);