fix for camera switching, broke 28359
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Apr 2010 08:39:10 +0000 (08:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Apr 2010 08:39:10 +0000 (08:39 +0000)
source/blender/editors/screen/screen_edit.c

index 448144471a9a2986cfa431e8370a0e9ad83dd837..b75e826c09c5df9b67e2d0d66d55efd01f3f53bd 100644 (file)
@@ -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