diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-13 03:12:30 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-13 03:12:30 +0400 |
| commit | 0ca96e1eb1da42268c11c286c74e79ed31da2c37 (patch) | |
| tree | 52bcd0a8f871b8cb491a7604ed1c8001832e78fc /source/blender/SConscript | |
| parent | 1ae159bff4c9c1d2e26df81744ab73c388b3bbe1 (diff) | |
| parent | fc42a6185ddeb6a24ec92287dfa7b89beb059716 (diff) | |
Merged changes in the trunk up to revision 41768.
Conflicts resolved:
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_enum_types.h
source/blender/render/intern/source/shadeinput.c
source/blenderplayer/bad_level_call_stubs/stubs.c
Additional changes:
* source/blender/makesrna/intern/rna_linestyle.c: Fixed white
space issues that generated a number of compiler errors. The
problem was that two string literals for enumerating MA_RAMP_SOFT
and MA_RAMP_LINEAR contained a space. The string literals are
supposed to represent a valid C identifier because of their use
for automatic code generation.
* Stroke transparency has been temporarily disabled due to a
functionality conflict with some merged changes. A fix of this
issue is planned.
Diffstat (limited to 'source/blender/SConscript')
| -rw-r--r-- | source/blender/SConscript | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript index ed69c9e57e9..1fe815849db 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -12,7 +12,6 @@ SConscript(['avi/SConscript', 'freestyle/SConscript', 'imbuf/SConscript', 'makesdna/SConscript', - 'makesrna/SConscript', 'render/SConscript', 'nodes/SConscript', 'modifiers/SConscript', @@ -20,7 +19,7 @@ SConscript(['avi/SConscript', 'windowmanager/SConscript', 'blenfont/SConscript']) - +makesrna = SConscript('makesrna/SConscript') if env['WITH_BF_PYTHON']: SConscript(['python/SConscript']) |