griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bugfix [#23189] Num-0 swtich to Camera view and back doesn't respect UserPerspective view.

Browse Source 
also fix for recent cmake edits.
This commit is contained in:
Campbell Barton
2010-09-07 09:15:59 +00:00
parent db775721c8
commit ea95d71067
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_view3d/view3d_edit.c
View 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);

4
source/blender/render/CMakeLists.txt
View 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)