bugfix [#23189] Num-0 swtich to Camera view and back doesn't respect UserPerspective...
authorCampbell Barton <ideasman42@gmail.com>
Tue, 7 Sep 2010 09:15:59 +0000 (09:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 7 Sep 2010 09:15:59 +0000 (09:15 +0000)
also fix for recent cmake edits.

source/blender/editors/space_view3d/view3d_edit.c
source/blender/render/CMakeLists.txt

index c2770d2eb8c797922d3aae2d6bfaca5b67f03990..3614717e9e07475c4a0cbe472fed5d855d89ae01 100644 (file)
@@ -1902,14 +1902,14 @@ static void axis_set_view(bContext *C, float q1, float q2, float q3, float q4, s
 
        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);
index 689683049153bb1c12ec6d2e10046f71be0da571..4e594abf441edc11829504a1d3f14370558062bf 100644 (file)
@@ -56,8 +56,8 @@ ENDIF(WITH_QUICKTIME)
 
 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)