diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-17 14:00:52 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-17 14:00:52 +0300 |
commit | 7d720cc655b43af7c871a3715eb9fd5d3ffd753a (patch) | |
tree | f9e50a5f7217ea4f27f67b12ae785b082d7a14d9 /source | |
parent | 9f0f8aabe2ca751386390ecb4121a3ae04107676 (diff) | |
parent | d33456e5ec70255a21089aa4c3dd7dc48307a344 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_render.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index 47933ff4b43..f45c888edf6 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -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", "", ""); |