diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-09 00:08:19 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-09 00:08:19 +0400 |
commit | c8b4cf92067ffeb625aa39003baf5d8f7c3f0025 (patch) | |
tree | c6c50dbc3d90a65fca6c1ca56a93e4a57cf7e154 /source/gameengine/Ketsji/SConscript | |
parent | e93db433a086a3e739c0f4026cd500f0b595b0f1 (diff) | |
parent | d76a6f5231c015c35123d22e1f5c3ffcdfbf9bbd (diff) |
2.50:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD
Notes:
* Game and sequencer RNA, and sequencer header are now out of date
a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
not needed anymore.
* Fix "duplicate strip" always increase the user count for ipo.
* IPO pinning on sequencer strips was lost during Undo.
Diffstat (limited to 'source/gameengine/Ketsji/SConscript')
-rw-r--r-- | source/gameengine/Ketsji/SConscript | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 921aba9c11f..5ab15c9eab3 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -8,25 +8,28 @@ defs = '' # XXX 2.5 # Mathutils C files. -#sources.extend([\ -# '#source/blender/python/api2_2x/Mathutils.c',\ -# '#source/blender/python/api2_2x/constant.c',\ -# '#source/blender/python/api2_2x/euler.c',\ -# '#source/blender/python/api2_2x/gen_utils.c',\ -# '#source/blender/python/api2_2x/matrix.c',\ -# '#source/blender/python/api2_2x/point.c',\ -# '#source/blender/python/api2_2x/quat.c',\ -# '#source/blender/python/api2_2x/vector.c',\ -#]) -# -#sources.extend([\ -# '#source/blender/python/api2_2x/bpy_internal_import.c' -#]) -# -# -#sources.extend([\ -# '#source/blender/python/api2_2x/BGL.c' -#]) +""" +if not env['BF_PYTHON_VERSION'].startswith('3'): + # TODO - py3 support + sources.extend([\ + '#source/blender/python/api2_2x/Mathutils.c',\ + '#source/blender/python/api2_2x/Geometry.c',\ + '#source/blender/python/api2_2x/euler.c',\ + '#source/blender/python/api2_2x/matrix.c',\ + '#source/blender/python/api2_2x/quat.c',\ + '#source/blender/python/api2_2x/vector.c',\ + '#source/blender/python/api2_2x/constant.c',\ + ]) + + sources.extend([\ + '#source/blender/python/api2_2x/BGL.c' + ]) + +sources.extend([\ + '#source/blender/python/api2_2x/bpy_internal_import.c' +]) +""" + incs = '. #source/blender/python/api2_2x' # Only for Mathutils! and bpy_internal_import.h, be very careful |