[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17900] trunk/blender: Reverting revision 17417 which broke cloth collisions which check also in blenkernel /intern for WITH_BULLET

Daniel Genrich daniel.genrich at gmx.net
Wed Dec 17 01:41:07 CET 2008


Revision: 17900
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17900
Author:   genscher
Date:     2008-12-17 01:41:07 +0100 (Wed, 17 Dec 2008)

Log Message:
-----------
Reverting revision 17417 which broke cloth collisions which check also in blenkernel/intern for WITH_BULLET

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17417

Modified Paths:
--------------
    trunk/blender/source/blender/src/SConscript
    trunk/blender/tools/Blender.py

Modified: trunk/blender/source/blender/src/SConscript
===================================================================
--- trunk/blender/source/blender/src/SConscript	2008-12-16 22:57:15 UTC (rev 17899)
+++ trunk/blender/source/blender/src/SConscript	2008-12-17 00:41:07 UTC (rev 17900)
@@ -65,9 +65,6 @@
     incs += ' ' + env['BF_ICONV_INC']
     defs.append('WITH_ICONV')
 
-if env['WITH_BF_GAMEENGINE']:
-	defs.append('GAMEBLENDER=1')
-
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
     incs += ' ' + env['BF_FFMPEG_INC']

Modified: trunk/blender/tools/Blender.py
===================================================================
--- trunk/blender/tools/Blender.py	2008-12-16 22:57:15 UTC (rev 17899)
+++ trunk/blender/tools/Blender.py	2008-12-17 00:41:07 UTC (rev 17900)
@@ -421,6 +421,10 @@
 			lenv = self.Clone()
 			lenv.Append(CPPPATH=includes)
 			lenv.Append(CPPDEFINES=defines)
+			if lenv['WITH_BF_GAMEENGINE']:
+					lenv.Append(CPPDEFINES=['GAMEBLENDER=1'])
+			if lenv['WITH_BF_BULLET']:
+					lenv.Append(CPPDEFINES=['WITH_BULLET=1'])
 			if lenv['BF_DEBUG'] or (libname in quickdebug):
 					lenv.Append(CFLAGS = lenv['BF_DEBUG_CFLAGS'])
 					lenv.Append(CCFLAGS = lenv['BF_DEBUG_CCFLAGS'])





More information about the Bf-blender-cvs mailing list