SVN maintenance.
authorGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>
Tue, 2 Aug 2011 05:31:32 +0000 (05:31 +0000)
committerGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>
Tue, 2 Aug 2011 05:31:32 +0000 (05:31 +0000)
12 files changed:
CMakeLists.txt
build_files/scons/config/darwin-config.py
build_files/scons/config/linux2-config.py
intern/ghost/intern/GHOST_NDOFManager.cpp
intern/ghost/intern/GHOST_NDOFManager.h
intern/ghost/intern/GHOST_NDOFManagerCocoa.h
intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
intern/ghost/intern/GHOST_NDOFManagerWin32.h
intern/ghost/intern/GHOST_NDOFManagerX11.cpp
intern/ghost/intern/GHOST_NDOFManagerX11.h
source/blender/makesrna/intern/rna_action.c

index d91d4a1349ddfd39b329ef50cb78a33048e227f3..2ac6d67cd1c0c31e78715db7ebcd6931731ef806 100644 (file)
@@ -1040,7 +1040,6 @@ elseif(APPLE)
        endif()
 
        if (WITH_NDOF)
-               # GHOST_NDOFManagerCocoa.mm needs "-fpascal-strings"
                # linker needs "-weak_framework 3DconnexionClient"
        endif()
 
index ca99357330f15271852fd28e6b5c71ad7770df5a..4a4bc4acd6711a5e382a9582cc0c35ab4b56a64e 100644 (file)
@@ -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
index 2f7bdace7d37dae6871ff6a353a54dd831120092..6fb9090b022a8088d7b0982bb623b9d3f951d1ec 100644 (file)
@@ -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)
 
index bda30ce8d8326864c4aced35bfd71932acad93b2..4694afaf24f6d5cc19082e172a5bb1c2c3791c1d 100644 (file)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -182,6 +184,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)
index ce0c3e96171cfad84ad76db57c6f00037edcc3ec..859cb64b859d7c01742d4e62bde9ae7826079a67 100644 (file)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
index d8711e915f6805311b84e38251a464714a4a4e04..27397b711b7a0e2df9840416a8429de4c33d2a54 100644 (file)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
index 995f73955f278bbbb4202573ea6388cdabc91ab8..07811c563ec83524a1464cc766e2b990d48b35a4 100644 (file)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
index d7285d568dee7e139ce69df69ddfb7ad87cee415..099b163edebc837bdefa8972b1ab02324ab778a2 100644 (file)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ * 
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
index 3802a6de93d6de4dd47ca4196b85ebf83aafe64a..31f7e074cd6b1bba8c596924fa972c2430e3faf5 100644 (file)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
index 233a9b367f14a8f1099cf6d0f6af7683be5fe702..8043af2760e7d972ee493793a96dfeb69514c19e 100644 (file)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
index 5e1c9d91074803f44084892f6351756a263e103c..175041b21e9817eb4d859a922fae7ffcb68c1ae0 100644 (file)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
index 7fdb96fda6e7f7eed05b58068af999158b9b49cd..cfedee3c6cdfc83fda3f4775862c56f99dba2692 100644 (file)
@@ -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);
 }