svn merge -r41723:41751 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Fri, 11 Nov 2011 06:37:29 +0000 (06:37 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 11 Nov 2011 06:37:29 +0000 (06:37 +0000)
1  2 
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/object.c
source/blender/blenlib/intern/threads.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/modifiers/intern/MOD_build.c
source/blenderplayer/bad_level_call_stubs/stubs.c

diff --cc CMakeLists.txt
index 926d5b2cf0cb7438126ce8bff11df615d63142c1,3b328669e48b3059107ae396d86f125fa62a0120..c88db32f1ed49699b23fd35be88e8d0529a7c4cd
@@@ -214,8 -214,10 +214,10 @@@ endif(
  option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
  
  # Cycles
- option(WITH_CYCLES                    "Enable Cycles Render Engine" OFF)
- OPTION(WITH_CYCLES_TEST               "Build cycles test application" OFF)
 -option(WITH_CYCLES                                    "Enable cycles Render Engine" ON)
++option(WITH_CYCLES                                    "Enable cycles Render Engine" OFF)
+ option(WITH_CYCLES_TEST                               "Build cycles test application" OFF)
+ option(WITH_CYCLES_CUDA_BINARIES      "Build cycles CUDA binaries" OFF)
+ set(CYCLES_CUDA_BINARIES_ARCH         sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
  
  # disable for now, but plan to support on all platforms eventually
  option(WITH_MEM_JEMALLOC   "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)