diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-23 18:09:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-23 18:09:53 +0400 |
| commit | 46e911d19b1b80075ef25aefbf1177e44c6dd9d6 (patch) | |
| tree | 2659c1c61464b39d0953dbe0002da440ff0894a0 /source/blender | |
| parent | 3ff3d1bc0fa6979d0745dbd7526cbb5c35c1fcbf (diff) | |
fix for crash when unlinking a scene from the renderlayers, also no need for PROP_ID_SELF_CHECK here.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 2 | ||||
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_image.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 0c31f042f93..c06c0a39f14 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -4032,7 +4032,7 @@ static void def_cmp_render_layers(StructRNA *srna) 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"); diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c index 41f1f81e048..0d68b999eb2 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -373,7 +373,8 @@ void node_cmp_rlayers_force_hidden_passes(bNode *node) 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) |