Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #30376: cycles ignores camera override from sequencer.

Browse Source
This commit is contained in:
Brecht Van Lommel
2012-04-13 17:42:03 +00:00
parent 440f449265
commit b219b5294b
6 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/blender/blender_camera.cpp
View File

@@ -250,7 +250,7 @@ static void blender_camera_sync(Camera *cam, BlenderCamera *bcam, int width, int
/* Sync Render Camera */ /* Sync Render Camera */
void BlenderSync::sync_camera(int width, int height) void BlenderSync::sync_camera(BL::Object b_override, int width, int height)
{ {
BlenderCamera bcam; BlenderCamera bcam;
blender_camera_init(&bcam); blender_camera_init(&bcam);
@@ -264,6 +264,9 @@ void BlenderSync::sync_camera(int width, int height)
/* camera object */ /* camera object */
BL::Object b_ob = b_scene.camera(); BL::Object b_ob = b_scene.camera();
if(b_override)
b_ob = b_override;
if(b_ob) { if(b_ob) {
blender_camera_from_object(&bcam, b_ob); blender_camera_from_object(&bcam, b_ob);
bcam.matrix = get_transform(b_ob.matrix_world()); bcam.matrix = get_transform(b_ob.matrix_world());

4
intern/cycles/blender/blender_session.cpp
View File

@@ -96,7 +96,7 @@ void BlenderSession::create_session()
if(b_rv3d) if(b_rv3d)
sync->sync_view(b_v3d, b_rv3d, width, height); sync->sync_view(b_v3d, b_rv3d, width, height);
else else
sync->sync_camera(width, height); sync->sync_camera(b_engine.camera_override(), width, height);
/* create session */ /* create session */
session = new Session(session_params); session = new Session(session_params);
@@ -314,7 +314,7 @@ void BlenderSession::synchronize()
if(b_rv3d) if(b_rv3d)
sync->sync_view(b_v3d, b_rv3d, width, height); sync->sync_view(b_v3d, b_rv3d, width, height);
else else
sync->sync_camera(width, height); sync->sync_camera(b_engine.camera_override(), width, height);
/* unlock */ /* unlock */
session->scene->mutex.unlock(); session->scene->mutex.unlock();

2
intern/cycles/blender/blender_sync.h
View File

@@ -55,7 +55,7 @@ public:
/* sync */ /* sync */
bool sync_recalc(); bool sync_recalc();
void sync_data(BL::SpaceView3D b_v3d, const char *layer = 0); void sync_data(BL::SpaceView3D b_v3d, const char *layer = 0);
void sync_camera(int width, int height); void sync_camera(BL::Object b_override, int width, int height);
void sync_view(BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int width, int height); void sync_view(BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int width, int height);
/* get parameters */ /* get parameters */

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

@@ -356,6 +356,10 @@ static void rna_def_render_engine(BlenderRNA *brna)
prop = RNA_def_property(srna, "is_preview", PROP_BOOLEAN, PROP_NONE); prop = RNA_def_property(srna, "is_preview", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", RE_ENGINE_PREVIEW); 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 */ /* registration */
prop = RNA_def_property(srna, "bl_idname", PROP_STRING, PROP_NONE); prop = RNA_def_property(srna, "bl_idname", PROP_STRING, PROP_NONE);

1
source/blender/render/extern/include/RE_engine.h vendored
View File

@@ -84,6 +84,7 @@ typedef struct RenderEngine {
void *py_instance; void *py_instance;
int flag; int flag;
struct Object *camera_override;
struct Render *re; struct Render *re;
ListBase fullresult; ListBase fullresult;

1
source/blender/render/intern/source/external_engine.c
View File

@@ -311,6 +311,7 @@ int RE_engine_render(Render *re, int do_all)
engine->flag |= RE_ENGINE_ANIMATION; engine->flag |= RE_ENGINE_ANIMATION;
if (re->r.scemode & R_PREVIEWBUTS) if (re->r.scemode & R_PREVIEWBUTS)
engine->flag |= RE_ENGINE_PREVIEW; engine->flag |= RE_ENGINE_PREVIEW;
engine->camera_override = re->camera_override;
if ((re->r.scemode & (R_NO_FRAME_UPDATE|R_PREVIEWBUTS))==0) if ((re->r.scemode & (R_NO_FRAME_UPDATE|R_PREVIEWBUTS))==0)
scene_update_for_newframe(re->main, re->scene, re->lay); scene_update_for_newframe(re->main, re->scene, re->lay);