[Bf-blender-cvs] [93c2753] soc-2016-cycles_denoising: Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising

[Lukas Stockner]

Commit: 93c275347ead3844789c2203f632c593a438e93b
Author: Lukas Stockner
Date:   Tue Dec 20 15:01:04 2016 +0100
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB93c275347ead3844789c2203f632c593a438e93b

Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising

Conflicts:
	source/blender/makesrna/intern/rna_render.c

===================================================================



===================================================================

diff --cc source/blender/makesrna/intern/rna_render.c
index 6c8f5f0,d69ae2b..afb9eb2
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@@ -528,26 -481,9 +530,26 @@@ static void rna_def_render_engine(Blend
  	func = RNA_def_function(srna, "update_script_node", NULL);
  	RNA_def_function_ui_description(func, "Compile shader script node");
  	RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL | FUNC_ALLOW_WRITE);
- 	prop = RNA_def_pointer(func, "node", "Node", "", "");
- 	RNA_def_property_flag(prop, PROP_RNAPTR);
+ 	parm = RNA_def_pointer(func, "node", "Node", "", "");
+ 	RNA_def_parameter_flags(parm, 0, PARM_RNAPTR);
  
 +	/* result postprocessing callbacks */
 +	func = RNA_def_function(srna, "can_postprocess", NULL);
 +	RNA_def_function_ui_description(func, "Pool whether a render result can be postprocessed");
 +	RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL | FUNC_ALLOW_WRITE);
- 	prop = RNA_def_pointer(func, "result", "RenderResult", "Result", "");
- 	RNA_def_property_flag(prop, PROP_REQUIRED);
- 	prop = RNA_def_boolean(func, "can_postprocess", 0, "Can post-process", "Whether the render result can be postprocessed or not");
- 	RNA_def_function_return(func, prop);
++	parm = RNA_def_pointer(func, "result", "RenderResult", "Result", "");
++	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
++	parm = RNA_def_boolean(func, "can_postprocess", 0, "Can post-process", "Whether the render result can be postprocessed or not");
++	RNA_def_function_return(func, parm);
 +
 +	func = RNA_def_function(srna, "postprocess", NULL);
 +	RNA_def_function_ui_description(func, "Postprocess the given render result");
 +	RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL | FUNC_ALLOW_WRITE);
- 	prop = RNA_def_pointer(func, "scene", "Scene", "Scene", "");
- 	RNA_def_property_flag(prop, PROP_REQUIRED);
- 	prop = RNA_def_pointer(func, "result", "RenderResult", "Result", "");
- 	RNA_def_property_flag(prop, PROP_REQUIRED);
++	parm = RNA_def_pointer(func, "scene", "Scene", "Scene", "");
++	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
++	parm = RNA_def_pointer(func, "result", "RenderResult", "Result", "");
++	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
 +
  	/* tag for redraw */
  	func = RNA_def_function(srna, "tag_redraw", "engine_tag_redraw");
  	RNA_def_function_ui_description(func, "Request redraw for viewport rendering");
@@@ -578,53 -514,43 +580,53 @@@
  
  	func = RNA_def_function(srna, "end_result", "RE_engine_end_result");
  	RNA_def_function_ui_description(func, "All pixels in the render result have been set and are final");
- 	prop = RNA_def_pointer(func, "result", "RenderResult", "Result", "");
- 	RNA_def_property_flag(prop, PROP_REQUIRED);
- 	RNA_def_boolean(func, "cancel", 0, "Cancel", "Don't merge results unless forced");
+ 	parm = RNA_def_pointer(func, "result", "RenderResult", "Result", "");
+ 	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
+ 	RNA_def_boolean(func, "cancel", 0, "Cancel", "Don't mark tile as done, don't merge results unless forced");
 +	RNA_def_boolean(func, "highlight", 0, "Highlight", "Don't mark tile as done yet");
  	RNA_def_boolean(func, "do_merge_results", 0, "Merge Results", "Merge results even if cancel=true");
  
 +	func = RNA_def_function(srna, "add_pass", "RE_engine_add_pass");
 +	RNA_def_function_ui_description(func, "Add a pass to the render layer");
- 	prop = RNA_def_int(func, "type", 0, 0, INT_MAX, "Pass Type", "", 0, INT_MAX);
- 	RNA_def_property_flag(prop, PROP_REQUIRED);
- 	prop = RNA_def_int(func, "channels", 0, 0, INT_MAX, "Channels", "", 0, INT_MAX);
- 	RNA_def_property_flag(prop, PROP_REQUIRED);
++	parm = RNA_def_int(func, "type", 0, 0, INT_MAX, "Pass Type", "", 0, INT_MAX);
++	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
++	parm = RNA_def_int(func, "channels", 0, 0, INT_MAX, "Channels", "", 0, INT_MAX);
++	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
 +	RNA_def_string(func, "layer", NULL, 0, "Layer", "Single layer to add render pass to");  /* NULL ok here */
 +	RNA_def_string(func, "view", NULL, 0, "View", "Single view to add render pass to");  /* NULL ok here */
 +
  	func = RNA_def_function(srna, "test_break", "RE_engine_test_break");
  	RNA_def_function_ui_description(func, "Test if the render operation should been canceled, this is a fast call that should be used regularly for responsiveness");
- 	prop = RNA_def_boolean(func, "do_break", 0, "Break", "");
- 	RNA_def_function_return(func, prop);
+ 	parm = RNA_def_boolean(func, "do_break", 0, "Break", "");
+ 	RNA_def_function_return(func, parm);
  
  	func = RNA_def_function(srna, "active_view_get", "RE_engine_active_view_get");
- 	prop = RNA_def_string(func, "view", NULL, 0, "View", "Single view active");
- 	RNA_def_function_return(func, prop);
+ 	parm = RNA_def_string(func, "view", NULL, 0, "View", "Single view active");
+ 	RNA_def_function_return(func, parm);
  
  	func = RNA_def_function(srna, "active_view_set", "RE_engine_active_view_set");
- 	RNA_def_string(func, "view", NULL, 0, "View", "Single view to set as active");  /* NULL ok here */
- 	RNA_def_property_flag(prop, PROP_REQUIRED);
+ 	parm = RNA_def_string(func, "view", NULL, 0, "View", "Single view to set as active");  /* NULL ok here */
+ 	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
  
  	func = RNA_def_function(srna, "camera_shift_x", "RE_engine_get_camera_shift_x");
- 	prop = RNA_def_pointer(func, "camera", "Object", "", "");
- 	RNA_def_property_flag(prop, PROP_REQUIRED);
- 	prop = RNA_def_boolean(func, "use_spherical_stereo", 0, "Spherical Stereo", "");
- 	prop = RNA_def_float(func, "shift_x", 0.0f, 0.0f, FLT_MAX, "Shift X", "", 0.0f, FLT_MAX);
- 	RNA_def_function_return(func, prop);
+ 	parm = RNA_def_pointer(func, "camera", "Object", "", "");
+ 	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
+ 	RNA_def_boolean(func, "use_spherical_stereo", 0, "Spherical Stereo", "");
+ 	parm = RNA_def_float(func, "shift_x", 0.0f, 0.0f, FLT_MAX, "Shift X", "", 0.0f, FLT_MAX);
+ 	RNA_def_function_return(func, parm);
  
  	func = RNA_def_function(srna, "camera_model_matrix", "RE_engine_get_camera_model_matrix");
- 	prop = RNA_def_pointer(func, "camera", "Object", "", "");
- 	RNA_def_property_flag(prop, PROP_REQUIRED);
- 	prop = RNA_def_boolean(func, "use_spherical_stereo", 0, "Spherical Stereo", "");
- 	prop = RNA_def_float_matrix(func, "r_model_matrix", 4, 4, NULL, 0.0f, 0.0f, "Model Matrix", "Normalized camera model matrix", 0.0f, 0.0f);
- 	RNA_def_property_flag(prop, PROP_REQUIRED);
+ 	parm = RNA_def_pointer(func, "camera", "Object", "", "");
+ 	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
+ 	RNA_def_boolean(func, "use_spherical_stereo", 0, "Spherical Stereo", "");
+ 	parm = RNA_def_float_matrix(func, "r_model_matrix", 4, 4, NULL, 0.0f, 0.0f, "Model Matrix", "Normalized camera model matrix", 0.0f, 0.0f);
+ 	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
  
  	func = RNA_def_function(srna, "use_spherical_stereo", "RE_engine_get_spherical_stereo");
- 	prop = RNA_def_pointer(func, "camera", "Object", "", "");
- 	RNA_def_property_flag(prop, PROP_REQUIRED);
- 	prop = RNA_def_boolean(func, "use_spherical_stereo", 0, "Spherical Stereo", "");
- 	RNA_def_function_return(func, prop);
+ 	parm = RNA_def_pointer(func, "camera", "Object", "", "");
+ 	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
+ 	parm = RNA_def_boolean(func, "use_spherical_stereo", 0, "Spherical Stereo", "");
+ 	RNA_def_function_return(func, parm);
  
  	func = RNA_def_function(srna, "update_stats", "RE_engine_update_stats");
  	RNA_def_function_ui_description(func, "Update and signal to redraw render status text");