Merged changes in the trunk up to revision 52690.

Conflicts resolved: release/datafiles/startup.blend source/blender/blenlib/intern/bpath.c
2012-12-01 02:47:59 +00:00
parent 129a29873e 75cce01a61
commit ed0e2fbd9f
259 changed files with 4507 additions and 2592 deletions
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -41,11 +41,12 @@ if env['WITH_BF_PYTHON']:
    if env['BF_DEBUG']:
        defs.append('DEBUG')

+'''
 if env['WITH_BF_ELTOPO']:
    incs += ' #/extern/eltopo'
    incs += ' #/extern/eltopo/eltopo3d'
    defs.append('WITH_ELTOPO')
-        
+'''
 if env['WITH_BF_QUICKTIME']:
    incs += ' ../quicktime'