[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25500] trunk/blender: - camera switching didnt work for openGL render

[Campbell Barton]

Revision: 25500
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25500
Author:   campbellbarton
Date:     2009-12-21 12:42:31 +0100 (Mon, 21 Dec 2009)

Log Message:
-----------
- camera switching didnt work for openGL render
- UV Project (Bounds) wasnt in the menu

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d.py
    trunk/blender/source/blender/editors/screen/screen_edit.c
    trunk/blender/source/blender/editors/screen/screen_ops.c

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py	2009-12-21 11:19:07 UTC (rev 25499)
+++ trunk/blender/release/scripts/ui/space_view3d.py	2009-12-21 11:42:31 UTC (rev 25500)
@@ -216,6 +216,7 @@
         layout.operator("uv.cylinder_project")
         layout.operator("uv.sphere_project")
         layout.operator("uv.project_from_view")
+        layout.operator("uv.project_from_view", text="Project from View (Bounds)").scale_to_bounds = True
 
         layout.separator()
 

Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c	2009-12-21 11:19:07 UTC (rev 25499)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c	2009-12-21 11:42:31 UTC (rev 25500)
@@ -1686,19 +1686,8 @@
 					while(sl) {
 						if(sl->spacetype==SPACE_VIEW3D) {
 							View3D *v3d= (View3D*) sl;
-							if (v3d->camera == scene->camera) {
+							if (v3d->scenelock) {
 								v3d->camera= camera;
-								/*
-								ARegion *ar;
-								for(ar=v3d->regionbase.first; ar; ar= ar->next) {
-									if(ar->regiontype == RGN_TYPE_WINDOW) {
-										RegionView3D *rv3d= ar->regiondata;
-
-										if(rv3d->persp==RV3D_CAMOB)
-											rv3d->persp= RV3D_PERSP;
-									}
-								}
-								*/
 							}
 						}
 						sl= sl->next;
@@ -1709,7 +1698,6 @@
 		}
 
 		scene->camera= camera;
-
 	}
 #endif
 

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2009-12-21 11:19:07 UTC (rev 25499)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2009-12-21 11:42:31 UTC (rev 25500)
@@ -3365,7 +3365,16 @@
 	}
 	
 	scene_update_for_newframe(scene, scene->lay);
-	
+
+	if(oglrender->rv3d->persp==RV3D_CAMOB && oglrender->v3d->camera && oglrender->v3d->scenelock) {
+		/* since scene_update_for_newframe() is used rather
+		 * then ED_update_for_newframe() the camera needs to be set */
+		Object *camera= scene_find_camera_switch(scene);
+
+		if(camera)
+			oglrender->v3d->camera= scene->camera= camera;
+	}
+
 	/* render into offscreen buffer */
 	screen_opengl_render_apply(oglrender);