diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-17 13:17:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-17 13:17:21 +0400 |
| commit | 734b4f60c1865d88d375b7c5b2003edc8c2291fa (patch) | |
| tree | 5f6a8799bad4e7260c88e2f3b6fa2f635f171fc5 | |
| parent | 359b683e1efef80648bf4dbd8225c540a05d0cf1 (diff) | |
missed adding show_grease_pencil to node space in recent commit
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 6 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_rna.c | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index f7475151e9d..6c084cdd898 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -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"); diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index fbdcc86c425..55983c73895 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -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); |