diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-13 21:42:03 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-13 21:42:03 +0400 |
| commit | b219b5294b15cff95030a15b929d3c7bbf5d35c7 (patch) | |
| tree | dd91b7247797439f77b249c2229f67c832a0325d /source | |
| parent | 440f4492656ec26c90017976553909b48e93c3fa (diff) | |
Fix #30376: cycles ignores camera override from sequencer.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesrna/intern/rna_render.c | 4 | ||||
| -rw-r--r-- | source/blender/render/extern/include/RE_engine.h | 1 | ||||
| -rw-r--r-- | source/blender/render/intern/source/external_engine.c | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index 22e9bbf6dda..6e9d94bd7fb 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -356,6 +356,10 @@ static void rna_def_render_engine(BlenderRNA *brna) prop = RNA_def_property(srna, "is_preview", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", RE_ENGINE_PREVIEW); + prop= RNA_def_property(srna, "camera_override", PROP_POINTER, PROP_NONE); + RNA_def_property_pointer_sdna(prop, NULL, "camera_override"); + RNA_def_property_struct_type(prop, "Object"); + /* registration */ prop = RNA_def_property(srna, "bl_idname", PROP_STRING, PROP_NONE); diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index 5e4a5e05a56..5afdb2a29ce 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -84,6 +84,7 @@ typedef struct RenderEngine { void *py_instance; int flag; + struct Object *camera_override; struct Render *re; ListBase fullresult; diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index ea352a16934..d8888cb4acc 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -311,6 +311,7 @@ int RE_engine_render(Render *re, int do_all) engine->flag |= RE_ENGINE_ANIMATION; if (re->r.scemode & R_PREVIEWBUTS) engine->flag |= RE_ENGINE_PREVIEW; + engine->camera_override = re->camera_override; if ((re->r.scemode & (R_NO_FRAME_UPDATE|R_PREVIEWBUTS))==0) scene_update_for_newframe(re->main, re->scene, re->lay); |