diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 4 | ||||
| -rw-r--r-- | build_files/scons/config/linux2-config.py | 8 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_NDOFManager.cpp | 6 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_action.c | 5 |
5 files changed, 15 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d91d4a1349d..2ac6d67cd1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1040,7 +1040,6 @@ elseif(APPLE) endif() if (WITH_NDOF) - # GHOST_NDOFManagerCocoa.mm needs "-fpascal-strings" # linker needs "-weak_framework 3DconnexionClient" endif() diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index ca99357330f..4a4bc4acd67 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -266,7 +266,7 @@ elif MACOSX_ARCHITECTURE == 'x86_64': BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2'] # SpaceNavigator and related 3D mice -WITH_BF_SPACENAV = True +WITH_BF_3DMOUSE = True ############################################################################# ################### various compile settings and flags ################## @@ -296,7 +296,7 @@ if WITH_BF_QUICKTIME == True: else: PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime'] -if WITH_BF_SPACENAV: +if WITH_BF_3DMOUSE: PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS + ['-weak_framework','3DconnexionClient'] #note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4 diff --git a/build_files/scons/config/linux2-config.py b/build_files/scons/config/linux2-config.py index 2f7bdace7d3..6fb9090b022 100644 --- a/build_files/scons/config/linux2-config.py +++ b/build_files/scons/config/linux2-config.py @@ -193,8 +193,8 @@ WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread'] #SpaceNavigator and friends -WITH_BF_NDOF = True -BF_NDOF_LIB = 'spnav' +WITH_BF_3DMOUSE = True +BF_3DMOUSE_LIB = 'spnav' ## CC = 'gcc' @@ -227,8 +227,8 @@ CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare'] ##FIX_STUBS_WARNINGS = -Wno-unused LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++'] -if WITH_BF_NDOF: - LLIBS = LLIBS + [BF_NDOF_LIB]; +if WITH_BF_3DMOUSE: + LLIBS = LLIBS + [BF_3DMOUSE_LIB]; ##LOPTS = --dynamic ##DYNLDFLAGS = -shared $(LDFLAGS) diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp index bda30ce8d83..c9db8bc36de 100644 --- a/intern/ghost/intern/GHOST_NDOFManager.cpp +++ b/intern/ghost/intern/GHOST_NDOFManager.cpp @@ -182,6 +182,12 @@ GHOST_NDOFManager::GHOST_NDOFManager(GHOST_System& sys) // the other is not, initialize them both here: memset(m_translation, 0, sizeof(m_translation)); memset(m_rotation, 0, sizeof(m_rotation)); + + #ifdef WITH_BF_3DMOUSE + puts("WITH_BF_3DMOUSE is defined!"); + #else + puts("WITH_BF_3DMOUSE is not defined."); + #endif } bool GHOST_NDOFManager::setDevice(unsigned short vendor_id, unsigned short product_id) diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index 7fdb96fda6e..cfedee3c6cd 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -191,8 +191,9 @@ static void rna_Action_active_pose_marker_index_range(PointerRNA *ptr, int *min, static void rna_Action_frame_range_get(PointerRNA *ptr,float *values) -{ - calc_action_range(ptr->id.data, values, values+1, 1); +{ /* don't include modifiers because they too easily can have very large + * ranges: MINAFRAMEF to MAXFRAMEF. */ + calc_action_range(ptr->id.data, values, values+1, FALSE); } |