[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24491] trunk/blender/source/blender/ makesrna/intern/rna_nodetree.c: Bugfix: switching renderlayer in compositing node crashed.

Brecht Van Lommel brecht at blender.org
Wed Nov 11 13:38:23 CET 2009


Revision: 24491
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24491
Author:   blendix
Date:     2009-11-11 13:38:22 +0100 (Wed, 11 Nov 2009)

Log Message:
-----------
Bugfix: switching renderlayer in compositing node crashed.

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	2009-11-11 11:49:46 UTC (rev 24490)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2009-11-11 12:38:22 UTC (rev 24491)
@@ -284,18 +284,6 @@
 	rna_Node_update(C, ptr);
 }
 
-static void rna_Node_scene_layer_update(bContext *C, PointerRNA *ptr)
-{
-	bNode *node= (bNode*)ptr->data;
-	Image *ima = (Image *)node->id;
-	ImageUser *iuser= node->storage;
-	
-	BKE_image_multilayer_index(ima->rr, iuser);
-	
-	rna_Node_update(C, ptr);
-}
-
-
 static EnumPropertyItem *renderresult_layers_add_enum(RenderLayer *rl)
 {
 	EnumPropertyItem *item= NULL;
@@ -1089,7 +1077,7 @@
 	RNA_def_property_enum_items(prop, prop_scene_layer_items);
 	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Node_scene_layer_itemf");
 	RNA_def_property_ui_text(prop, "Layer", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_scene_layer_update");
+	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
 	
 	/* TODO: comments indicate this might be a hack */
 	prop = RNA_def_property(srna, "re_render", PROP_BOOLEAN, PROP_NONE);





More information about the Bf-blender-cvs mailing list