[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58543] trunk/blender/source/blender: fix for crash when unlinking a scene from the renderlayers, also no need for PROP_ID_SELF_CHECK here.

[Campbell Barton]

Revision: 58543
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58543
Author:   campbellbarton
Date:     2013-07-23 14:09:53 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
fix for crash when unlinking a scene from the renderlayers, also no need for PROP_ID_SELF_CHECK here.

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

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-07-23 12:49:30 UTC (rev 58542)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-07-23 14:09:53 UTC (rev 58543)
@@ -4032,7 +4032,7 @@
 	RNA_def_property_pointer_sdna(prop, NULL, "id");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_Node_scene_set", NULL, NULL);
 	RNA_def_property_struct_type(prop, "Scene");
-	RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
+	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Scene", "");
 	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c	2013-07-23 12:49:30 UTC (rev 58542)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c	2013-07-23 14:09:53 UTC (rev 58543)
@@ -373,7 +373,8 @@
 	bNodeSocket *sock;
 	
 	/* must always have valid scene pointer */
-	BLI_assert(scene != NULL);
+	if (!scene)
+		return;
 	
 	srl = BLI_findlink(&scene->r.layers, node->custom1);
 	if (!srl)