archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 38543.

Browse Source 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
This commit is contained in:
Tamito Kajiyama
2011-07-20 23:33:10 +00:00
parent 4c3140004a 76e91d7a5f
commit ce03ec4b86
395 changed files with 34491 additions and 33122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/python/SConscript
View File

@@ -1,6 +1,6 @@
#!/usr/bin/python
# TODO, split into 2 files.
# TODO, split into 3 files.
Import ('env')
@@ -19,7 +19,14 @@ if is_debug:
defs.append('_DEBUG')
sources = env.Glob('generic/*.c')
env.BlenderLib( libname = 'bf_python_ext', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [362,165]) # ketsji is 360
env.BlenderLib( libname = 'bf_python_ext', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [363,165]) # ketsji is 360
# mathutils
defs = []
sources = env.Glob('mathutils/*.c')
env.BlenderLib( libname = 'bf_python_mathutils', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [362,165])
# bpy