diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-04-23 12:39:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-23 12:39:10 +0400 |
| commit | 0429707e6c077ceecd651cd00682016cfac74fe2 (patch) | |
| tree | ae361c0df343bfce8e8c402a0a5e7cf0de693450 /source/blender/editors/screen/screen_edit.c | |
| parent | 320408ff1212fd8a29d460b6463a15cccee0f4b8 (diff) | |
fix for camera switching, broke 28359
Diffstat (limited to 'source/blender/editors/screen/screen_edit.c')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 448144471a9..b75e826c09c 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1724,16 +1724,12 @@ void ED_update_for_newframe(const bContext *C, int mute) #ifdef DURIAN_CAMERA_SWITCH void *camera= scene_camera_switch_find(scene); if(camera && scene->camera != camera) { - - if(camera && scene->camera && (camera != scene->camera)) { - bScreen *sc; - /* are there cameras in the views that are not in the scene? */ - for(sc= CTX_data_main(C)->screen.first; sc; sc= sc->id.next) { - BKE_screen_view3d_scene_sync(sc); - } - } - + bScreen *sc; scene->camera= camera; + /* are there cameras in the views that are not in the scene? */ + for(sc= CTX_data_main(C)->screen.first; sc; sc= sc->id.next) { + BKE_screen_view3d_scene_sync(sc); + } } #endif |