diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-10-16 11:10:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-16 11:10:28 +0300 |
commit | 80f0bc99a9831709338fdb252546829afdf4912a (patch) | |
tree | a5488eddaaf6ef395bc5a1170703f8cbc948b1d1 /source/blender/blenkernel/intern/scene.c | |
parent | 0dcc5572d6ab625056f3f89cfaa917bcc6625d6d (diff) |
Fix T70850: Scene.frame_set doesn't update camera from markers
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index e8e849cdf6d..53e5f1fdfe5 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1008,19 +1008,19 @@ Object *BKE_scene_camera_switch_find(Scene *scene) } #endif -int BKE_scene_camera_switch_update(Scene *scene) +bool BKE_scene_camera_switch_update(Scene *scene) { #ifdef DURIAN_CAMERA_SWITCH Object *camera = BKE_scene_camera_switch_find(scene); - if (camera) { + if (camera && (camera != scene->camera)) { scene->camera = camera; DEG_id_tag_update(&scene->id, ID_RECALC_COPY_ON_WRITE); - return 1; + return true; } #else (void)scene; #endif - return 0; + return false; } char *BKE_scene_find_marker_name(Scene *scene, int frame) |