griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make sure RenderLayer/Image nodes always return a valid enum items list.

Browse Source
This commit is contained in:
Lukas Tönne
2014-02-17 13:07:56 +01:00
parent a61e3b9a9e
commit d607a70795
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/makesrna/intern/rna_nodetree.c
View File

@@ -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;