Merged changes in the trunk up to revision 54802.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 24 Feb 2013 03:39:20 +0000 (03:39 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 24 Feb 2013 03:39:20 +0000 (03:39 +0000)
39 files changed:
1  2 
CMakeLists.txt
build_files/scons/config/darwin-config.py
build_files/scons/config/linux-config.py
build_files/scons/config/win32-mingw-config.py
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-mingw-config.py
build_files/scons/config/win64-vc-config.py
doc/python_api/sphinx_doc_gen.py
intern/cycles/blender/addon/ui.py
release/scripts/startup/bl_ui/__init__.py
source/blender/blenfont/BLF_translation.h
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/bmesh_class.h
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/SConscript
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c

diff --cc CMakeLists.txt
Simple merge
@@@ -315,11 -315,8 +315,11 @@@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib
  
  WITH_BF_CYCLES_CUDA_BINARIES = False
  BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
- BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+ BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
  
 +#Freestyle
 +WITH_BF_FREESTYLE = True
 +
  #Ray trace optimization
  if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
      WITH_BF_RAYOPTIMIZATION = True
@@@ -174,11 -174,8 +174,11 @@@ BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse'
  #CUDA
  WITH_BF_CYCLES_CUDA_BINARIES = False
  #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
- BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+ BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
  
 +#Freestyle
 +WITH_BF_FREESTYLE = True
 +
  ##
  CC = 'gcc'
  CXX = 'g++'
Simple merge
Simple merge
Simple merge
@@@ -33,9 -32,6 +33,9 @@@ defs = [
  o = SConscript('intern/SConscript')
  objs += o
  
- incs = '#/intern/guardedalloc .'
+ incs = '#/intern/guardedalloc . ../blenlib'
  
 -env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core','player'], priority = [215,200] )
 +if env['WITH_BF_FREESTYLE']:
 +    defs.append('WITH_FREESTYLE')
 +
 +env.BlenderLib ( 'bf_dna', objs, Split(incs), defs, libtype=['core','player'], priority = [215,200] )
Simple merge
Simple merge