Merging r38988 through r38992 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 3 Aug 2011 16:39:16 +0000 (16:39 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 3 Aug 2011 16:39:16 +0000 (16:39 +0000)
1  2 
CMakeLists.txt
source/blender/editors/transform/transform_generics.c

diff --cc CMakeLists.txt
index 89ee95df4575af265d0c9e79914c77f3c09d7d15,a0a0359d8d751fbe8b182ab13e7d7f6a273999c3..e054eb9ce7ed5987ab1b077d33eb4fcef2dcc70b
@@@ -178,11 -178,8 +178,11 @@@ option(WITH_SAMPLERATE    "Enable sampl
  option(WITH_LZO           "Enable fast LZO compression (used for pointcache)" ON)
  option(WITH_LZMA          "Enable best LZMA compression, (used for pointcache)" ON)
  
 +# Tracking
 +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)