svn merge -r 12691:12716 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Thu, 29 Nov 2007 12:40:53 +0000 (12:40 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Thu, 29 Nov 2007 12:40:53 +0000 (12:40 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/include/butspace.h
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/editobject.c
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
tools/btools.py

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tools/btools.py
index 1b91a3343dcbc7dc1f9543fead7cb5cf62605bc4,455335ab89509b043c844cd9b5d1bb97a36ea858..488b434c58abed4ebc98eb2c9004a3092753a2d0
@@@ -54,10 -54,9 +54,10 @@@ def validate_arguments(args, bc)
              'BF_PROFILE_FLAGS', 'LCGDIR', 'WITH_BF_VERSE', 
              'BF_VERSE_INCLUDE',
              'VERSE_BUILD_BINARY', 'VERSE_BUILD_DIR', 'VERSE_REGEN_PROTO',
-             'BF_TWEAK_MODE',
+             'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
 -            'WITHOUT_BF_INSTALL'
 -            ]
 +            'WITHOUT_BF_INSTALL',
 +            'WITH_BF_OPENMP'
 +          ]
  
      arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
              'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME',