[Bf-blender-cvs] [d607a70] master: Make sure RenderLayer/Image nodes always return a valid enum items list.
Lukas Tönne
noreply at git.blender.org
Mon Feb 17 13:16:43 CET 2014
Commit: d607a70795d0478eb70bbb05cf297f871a97cd4e
Author: Lukas Tönne
Date: Mon Feb 17 13:07:56 2014 +0100
https://developer.blender.org/rBd607a70795d0478eb70bbb05cf297f871a97cd4e
Make sure RenderLayer/Image nodes always return a valid enum items list.
===================================================================
M source/blender/makesrna/intern/rna_nodetree.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 57713e7..92b8c93 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -2613,10 +2613,14 @@ static EnumPropertyItem *rna_Node_image_layer_itemf(bContext *UNUSED(C), Pointer
EnumPropertyItem *item = NULL;
RenderLayer *rl;
- if (!ima || !(ima->rr)) return NULL;
-
- rl = ima->rr->layers.first;
- item = renderresult_layers_add_enum(rl);
+ if (ima && ima->rr) {
+ rl = ima->rr->layers.first;
+ item = renderresult_layers_add_enum(rl);
+ }
+ else {
+ int totitem = 0;
+ RNA_enum_item_end(&item, &totitem);
+ }
*r_free = true;
@@ -2631,10 +2635,14 @@ static EnumPropertyItem *rna_Node_scene_layer_itemf(bContext *UNUSED(C), Pointer
EnumPropertyItem *item = NULL;
RenderLayer *rl;
- if (!sce) return NULL;
-
- rl = sce->r.layers.first;
- item = renderresult_layers_add_enum(rl);
+ if (sce) {
+ rl = sce->r.layers.first;
+ item = renderresult_layers_add_enum(rl);
+ }
+ else {
+ int totitem = 0;
+ RNA_enum_item_end(&item, &totitem);
+ }
*r_free = true;
More information about the Bf-blender-cvs
mailing list