[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55211] trunk/blender/source/blender/ makesrna/intern/rna_nodetree.c: Changing image ID datablock fomr browser in Image node didn' t change output sockets

[Sergey Sharybin]

Revision: 55211
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55211
Author:   nazgul
Date:     2013-03-12 11:03:50 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Changing image ID datablock fomr browser in Image node didn't change output sockets

Which lead to either multilayer sockets hanging around when switching image from
multilayer to singlelayer, or missing layers outputs when switching from single
to multilayer image.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-03-12 10:34:14 UTC (rev 55210)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-03-12 11:03:50 UTC (rev 55211)
@@ -1042,6 +1042,16 @@
 	return NULL;
 }
 
+static void rna_Image_Node_update_id(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+	bNode *node = (bNode *)ptr->data;
+
+	node->update |= NODE_UPDATE_ID;
+	node_update(bmain, scene, ntree, node);
+	node->update &= ~NODE_UPDATE_ID;
+}
+
 static void rna_Mapping_Node_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 	bNode *node = ptr->data;
@@ -2444,7 +2454,7 @@
 	RNA_def_property_struct_type(prop, "Image");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Image", "");
-	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Image_Node_update_id");
 
 	prop = RNA_def_property(srna, "use_straight_alpha_output", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom1", CMP_NODE_IMAGE_USE_STRAIGHT_OUTPUT);