From cb89decfdcf5e6b2f26376d416633f4ccf0c532d Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 4 Sep 2008 20:51:28 +0000 Subject: Merge of first part of changes from the apricot branch, especially the features that are needed to run the game. Compile tested with scons, make, but not cmake, that seems to have an issue not related to these changes. The changes include: * GLSL support in the viewport and game engine, enable in the game menu in textured draw mode. * Synced and merged part of the duplicated blender and gameengine/ gameplayer drawing code. * Further refactoring of game engine drawing code, especially mesh storage changed a lot. * Optimizations in game engine armatures to avoid recomputations. * A python function to get the framerate estimate in game. * An option take object color into account in materials. * An option to restrict shadow casters to a lamp's layers. * Increase from 10 to 18 texture slots for materials, lamps, word. An extra texture slot shows up once the last slot is used. * Memory limit for undo, not enabled by default yet because it needs the .B.blend to be changed. * Multiple undo for image painting. * An offset for dupligroups, so not all objects in a group have to be at the origin. --- source/blender/SConscript | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/SConscript') diff --git a/source/blender/SConscript b/source/blender/SConscript index 56a661238f8..25745c0e51a 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -7,6 +7,7 @@ SConscript(['avi/SConscript', 'blenlib/SConscript', 'blenloader/SConscript', 'blenpluginapi/SConscript', + 'gpu/SConscript', 'imbuf/SConscript', 'imbuf/intern/cineon/SConscript', 'makesdna/SConscript', -- cgit v1.2.3 From 2ecf987dc665eff477fb03a0cef0b2972e4b78d2 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Wed, 22 Oct 2008 11:28:10 +0000 Subject: * Minor cleanup of SCons files - cleanup of boolean usage - use True and False now instead of 'true'/'false' or 0/1 - changed SConscripts accordingly --- source/blender/SConscript | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/SConscript') diff --git a/source/blender/SConscript b/source/blender/SConscript index 25745c0e51a..decbbf35642 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -18,17 +18,17 @@ SConscript(['avi/SConscript', 'src/SConscript', 'nodes/SConscript']) -if env['WITH_BF_YAFRAY'] == 1: +if env['WITH_BF_YAFRAY']: SConscript(['yafray/SConscript']) -if env['WITH_BF_INTERNATIONAL'] == 1: +if env['WITH_BF_INTERNATIONAL']: SConscript (['ftfont/SConscript']) -if env['WITH_BF_DDS'] == 1: +if env['WITH_BF_DDS']: SConscript (['imbuf/intern/dds/SConscript']) -if env['WITH_BF_OPENEXR'] == 1: +if env['WITH_BF_OPENEXR']: SConscript (['imbuf/intern/openexr/SConscript']) -if env['WITH_BF_QUICKTIME'] == 1: +if env['WITH_BF_QUICKTIME']: SConscript (['quicktime/SConscript']) -- cgit v1.2.3 From ac4ff83ca6b5795f4451a7e743d3975aeb17ae3b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 28 Oct 2008 18:47:13 +0000 Subject: added scons option BF_WITH_PYTHON (defined as DISABLE_PYTHON) --- source/blender/SConscript | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/SConscript') diff --git a/source/blender/SConscript b/source/blender/SConscript index decbbf35642..543a0bf5ed6 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -11,13 +11,17 @@ SConscript(['avi/SConscript', 'imbuf/SConscript', 'imbuf/intern/cineon/SConscript', 'makesdna/SConscript', - 'python/SConscript', 'radiosity/SConscript', 'readblenfile/SConscript', 'render/SConscript', 'src/SConscript', 'nodes/SConscript']) + + +if env['WITH_BF_PYTHON']: + SConscript(['python/SConscript']) + if env['WITH_BF_YAFRAY']: SConscript(['yafray/SConscript']) -- cgit v1.2.3