From 068cceab6c491ddbe3a3baec560900a57db279b2 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 4 Sep 2012 18:27:47 +0000 Subject: fix for some errors reported by http://clang.blenderheads.org/trunk/ in r50384. - when renderlayers could not be found in save_render_result_tile() blender would crash. - RE_engine_end_result() / rna end_result() didn't set result argument as required. ... also some style cleanup. --- source/blender/makesrna/intern/rna_render.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/makesrna/intern/rna_render.c') diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index a755e130bb7..d2e4e8edbfb 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -317,7 +317,7 @@ static void rna_def_render_engine(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_REQUIRED); prop = RNA_def_int(func, "h", 0, 0, INT_MAX, "Height", "", 0, INT_MAX); RNA_def_property_flag(prop, PROP_REQUIRED); - prop = RNA_def_string(func, "layer", "", 0, "Layer", "Single layer to get render result for"); + RNA_def_string(func, "layer", "", 0, "Layer", "Single layer to get render result for"); /* NULL ok here */ prop = RNA_def_pointer(func, "result", "RenderResult", "Result", ""); RNA_def_function_return(func, prop); @@ -327,6 +327,7 @@ static void rna_def_render_engine(BlenderRNA *brna) func = RNA_def_function(srna, "end_result", "RE_engine_end_result"); prop = RNA_def_pointer(func, "result", "RenderResult", "Result", ""); + RNA_def_property_flag(prop, PROP_REQUIRED); prop = RNA_def_boolean(func, "cancel", 0, "Cancel", "Don't merge back results"); RNA_def_property_flag(prop, PROP_REQUIRED); -- cgit v1.2.3