svn merge -r 13240:13323 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Mon, 21 Jan 2008 02:42:42 +0000 (02:42 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Mon, 21 Jan 2008 02:42:42 +0000 (02:42 +0000)
18 files changed:
1  2 
CMakeLists.txt
extern/SConscript
source/Makefile
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/include/butspace.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/drawobject.c
source/blender/src/editobject.c
source/blender/src/editparticle.c
source/blender/src/toolbox.c
source/blender/src/transform_conversions.c
source/blender/src/usiblender.c
tools/btools.py

diff --cc CMakeLists.txt
index 4eb5e9c659d95818280320160cb6c4ce7b819717,16818b4a8462b08523ab3527239ed7bc97f60af8..673c5e99348a22f3b5d65dbf5436b3bf54894ea2
@@@ -65,9 -65,9 +65,10 @@@ OPTION(WITH_ELBEEM           "Enable Elbeem (Flu
  OPTION(WITH_QUICKTIME         "Enable Quicktime Support"                              OFF)
  OPTION(WITH_OPENEXR           "Enable OpenEXR Support (http://www.openexr.com)"       OFF)
  OPTION(WITH_FFMPEG            "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"   OFF)
 -OPTION(WITH_OPENAL            "Enable OpenAL Support (http://www.openal.org)" ON)
 -OPTION(YESIAMSTUPID           "Enable execution on 64-bit platforms"                                  OFF)
 +OPTION(WITH_OPENAL            "Enable OpenAL Support (http://www.openal.org)"         ON)
 +OPTION(YESIAMSTUPID           "Enable execution on 64-bit platforms"                  OFF)
 +OPTION(WITH_OPENMP            "Enable OpenMP (has to be supported by the compiler)"   OFF)
+ OPTION(WITH_BINRELOC          "Enable binreloc filepath support"                              OFF)
  
  IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
    MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
Simple merge
diff --cc source/Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tools/btools.py
Simple merge