[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31807] trunk/blender/source/blender: bugfix [#23189] Num-0 swtich to Camera view and back doesn' t respect UserPerspective view.

[Campbell Barton]

Revision: 31807
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31807
Author:   campbellbarton
Date:     2010-09-07 11:15:59 +0200 (Tue, 07 Sep 2010)

Log Message:
-----------
bugfix [#23189] Num-0 swtich to Camera view and back doesn't respect UserPerspective view.
also fix for recent cmake edits.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
    trunk/blender/source/blender/render/CMakeLists.txt

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2010-09-07 08:16:28 UTC (rev 31806)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2010-09-07 09:15:59 UTC (rev 31807)
@@ -1902,14 +1902,14 @@
 
 	if (rv3d->persp==RV3D_CAMOB && v3d->camera) {
 
-		if (U.uiflag & USER_AUTOPERSP) rv3d->persp= RV3D_ORTHO;
+		if (U.uiflag & USER_AUTOPERSP) rv3d->persp= view ? RV3D_ORTHO : RV3D_PERSP;
 		else if(rv3d->persp==RV3D_CAMOB) rv3d->persp= perspo;
 
 		smooth_view(C, v3d->camera, NULL, rv3d->ofs, new_quat, NULL, NULL);
 	}
 	else {
 
-		if (U.uiflag & USER_AUTOPERSP) rv3d->persp= RV3D_ORTHO;
+		if (U.uiflag & USER_AUTOPERSP) rv3d->persp= view ? RV3D_ORTHO : RV3D_PERSP;
 		else if(rv3d->persp==RV3D_CAMOB) rv3d->persp= perspo;
 
 		smooth_view(C, NULL, NULL, NULL, new_quat, NULL, NULL);

Modified: trunk/blender/source/blender/render/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/render/CMakeLists.txt	2010-09-07 08:16:28 UTC (rev 31806)
+++ trunk/blender/source/blender/render/CMakeLists.txt	2010-09-07 09:15:59 UTC (rev 31807)
@@ -56,8 +56,8 @@
 
 IF(APPLE)
 	IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
-		LIST(APPEND CMAKE_C_FLAGS_RELEASE -mfpmath=sse)
-		LIST(APPEND CMAKE_CXX_FLAGS_RELEASE -mfpmath=sse)
+		SET(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse)
+		SET(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse)
 	ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
 ENDIF(APPLE)