[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28371] trunk/blender/source/blender/ editors/screen/screen_edit.c: fix for camera switching, broke 28359

[Campbell Barton]

Revision: 28371
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28371
Author:   campbellbarton
Date:     2010-04-23 10:39:10 +0200 (Fri, 23 Apr 2010)

Log Message:
-----------
fix for camera switching, broke 28359 

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_edit.c

Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c	2010-04-23 06:36:44 UTC (rev 28370)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c	2010-04-23 08:39:10 UTC (rev 28371)
@@ -1724,16 +1724,12 @@
 #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