svn merge ^/trunk/blender -r48576:48585
authorCampbell Barton <ideasman42@gmail.com>
Wed, 4 Jul 2012 11:53:48 +0000 (11:53 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 4 Jul 2012 11:53:48 +0000 (11:53 +0000)
1  2 
release/scripts/startup/bl_ui/space_node.py
source/blender/compositor/intern/COM_Converter.cpp
source/blender/editors/space_node/node_draw.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_space.c

index ef3028674b74dcfdf2d913fc605aa68f9aab52b9,09d2668d10b5daf07c2dc1ffd9fd4270ec6affeb..33bcd116d3968fe1a141d3f9e3da371178eea38c
@@@ -2933,10 -2927,10 +2933,15 @@@ static void rna_def_space_node(BlenderR
        RNA_def_property_ui_text(prop, "Draw Channels", "Channels of the image to draw");
        RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE_VIEW, NULL);
  
 +      prop = RNA_def_property(srna, "view_settings", PROP_POINTER, PROP_NONE);
 +      RNA_def_property_pointer_sdna(prop, NULL, "view_settings");
 +      RNA_def_property_struct_type(prop, "ColorManagedViewSettings");
 +      RNA_def_property_ui_text(prop, "View Settings", "Color management settings used for displaying images on the display");
++
+       prop = RNA_def_property(srna, "show_highlight", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_sdna(prop, NULL, "flag", SNODE_SHOW_HIGHLIGHT);
+       RNA_def_property_ui_text(prop, "Highlight", "Highlight nodes that are being calculated");
+       RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE_VIEW, NULL);
  }
  
  static void rna_def_space_logic(BlenderRNA *brna)