[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38993] branches/soc-2011-tomato: Merging r38988 through r38992 from trunk into soc-2011-tomato

[Sergey Sharybin]

Revision: 38993
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38993
Author:   nazgul
Date:     2011-08-03 16:39:16 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
Merging r38988 through r38992 from trunk into soc-2011-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38988
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38992

Modified Paths:
--------------
    branches/soc-2011-tomato/CMakeLists.txt
    branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
    branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c

Property Changed:
----------------
    branches/soc-2011-tomato/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:36831-38987
   + /trunk/blender:36831-38992

Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt	2011-08-03 14:21:49 UTC (rev 38992)
+++ branches/soc-2011-tomato/CMakeLists.txt	2011-08-03 16:39:16 UTC (rev 38993)
@@ -182,7 +182,7 @@
 option(WITH_LIBMV         "Enable libmv structure from motion library" ON)
 
 # Misc
-option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" OFF)
+option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
 option(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON) 
 if(UNIX AND NOT APPLE)
 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
@@ -1001,9 +1001,24 @@
 		elseif(WITH_CODEC_QUICKTIME)
 			set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
 		endif()
+
+		# XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED! 
+		# ALSO SHOULD BE MOVED INTO OWN MODULE WHEN FUNCTIONAL
+		if(WITH_INPUT_NDOF)
+			# This thread it *should* work and check the framework - campbell
+			# http://www.cmake.org/pipermail/cmake/2005-December/007740.html
+			find_library(3D_CONNEXION_CLIENT_LIBRARY
+				NAMES 3DconnexionClient
+			)
+			if(NOT 3D_CONNEXION_CLIENT_LIBRARY)
+				set(WITH_INPUT_NDOF OFF)
+			endif()
+		endif()
+
 	else()
 		set(PLATFORM_CFLAGS "-pipe -funsigned-char")
 		set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
+		set(WITH_INPUT_NDOF OFF)  # unsupported
 	endif()
 
 	if(WITH_OPENCOLLADA)

Modified: branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/darwin-config.py	2011-08-03 14:21:49 UTC (rev 38992)
+++ branches/soc-2011-tomato/build_files/scons/config/darwin-config.py	2011-08-03 16:39:16 UTC (rev 38993)
@@ -266,7 +266,7 @@
     BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2']
 
 # SpaceNavigator and related 3D mice
-WITH_BF_3DMOUSE = True
+WITH_BF_3DMOUSE = False
 
 #############################################################################
 ###################  various compile settings and flags    ##################

Modified: branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c	2011-08-03 14:21:49 UTC (rev 38992)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c	2011-08-03 16:39:16 UTC (rev 38993)
@@ -930,6 +930,7 @@
 	t->flag &= ~T_ALL_RESTRICTIONS;
 }
 
+/* the *op can be NULL */
 int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 {
 	Scene *sce = CTX_data_scene(C);
@@ -1058,7 +1059,7 @@
 		}
 
 		/* initialize UV transform from */
-		if (RNA_struct_find_property(op->ptr, "correct_uv")) {
+		if (op && RNA_struct_find_property(op->ptr, "correct_uv")) {
 			if(RNA_property_is_set(op->ptr, "correct_uv")) {
 				if(RNA_boolean_get(op->ptr, "correct_uv")) {
 					t->settings->uvcalc_flag |= UVCALC_TRANSFORM_CORRECT;