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

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-08-17 13:00:52 +02:00
parent 9f0f8aabe2 d33456e5ec
commit 7d720cc655
18 changed files with 182 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/makesrna/intern/rna_render.c
View File

@@ -619,6 +619,7 @@ static void rna_def_render_engine(BlenderRNA *brna)
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);
RNA_def_function_output(func, parm);
func = RNA_def_function(srna, "use_spherical_stereo", "RE_engine_get_spherical_stereo");
parm = RNA_def_pointer(func, "camera", "Object", "", "");