Finally change SConscript tabs to spaces.

43 files changed, 303 insertions, 303 deletions

diff --git a/source/SConscript b/source/SConscript
index 3944a3c6df5..c452f21b8e2 100644
--- a/source/SConscript
+++ b/source/SConscript
@@ -2,13 +2,13 @@
 Import ('env')
 
 SConscript(['blender/SConscript',
-			'kernel/SConscript',
-			'creator/SConscript'])
+            'kernel/SConscript',
+            'creator/SConscript'])
 if env['WITH_BF_GAMEENGINE']:
-	SConscript (['gameengine/SConscript'])
+    SConscript (['gameengine/SConscript'])
 
 if env['WITH_BF_PLAYER']:
-	SConscript (['blenderplayer/bad_level_call_stubs/SConscript'])
+    SConscript (['blenderplayer/bad_level_call_stubs/SConscript'])
 
 if env['OURPLATFORM'] in ('win64-vc', 'win32-vc', 'win32-mingw', 'linuxcross'):
-	SConscript (['icons/SConscript'])
+    SConscript (['icons/SConscript'])
diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript
index 34ffaa71c76..2763bea0da0 100644
--- a/source/blender/blenfont/SConscript
+++ b/source/blender/blenfont/SConscript
@@ -12,8 +12,8 @@ incs += ' ' + env['BF_GETTEXT_INC']
 defs = []
 
 if sys.platform == 'win32' or env['OURPLATFORM'] == 'linuxcross':
-	defs.append('_WIN32')
-	defs.append('USE_GETTEXT_DLL')
+    defs.append('_WIN32')
+    defs.append('USE_GETTEXT_DLL')
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('INTERNATIONAL')
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 9f5027f801d..1e48f94f14d 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -20,68 +20,68 @@ incs += ' ' + env['BF_ZLIB_INC']
 defs = [ 'GLEW_STATIC' ]
 
 if not env['WITH_BF_PYTHON']:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 else:
-	incs += ' ../python'
-	incs += ' ' + env['BF_PYTHON_INC']
-	if env['BF_DEBUG']:
-		defs.append('_DEBUG')
+    incs += ' ../python'
+    incs += ' ' + env['BF_PYTHON_INC']
+    if env['BF_DEBUG']:
+        defs.append('_DEBUG')
 
 if env['WITH_BF_QUICKTIME']:
-	incs += ' ../quicktime'
+    incs += ' ../quicktime'
 
 if env['WITH_BF_SDL']:
-	incs += ' ' + env['BF_SDL_INC']
+    incs += ' ' + env['BF_SDL_INC']
 else:
-	defs.append('DISABLE_SDL')
+    defs.append('DISABLE_SDL')
 
 if env['WITH_BF_OPENEXR']:
-	defs.append('WITH_OPENEXR')
+    defs.append('WITH_OPENEXR')
 
 if env['WITH_BF_TIFF']:
-	defs.append('WITH_TIFF')
+    defs.append('WITH_TIFF')
 
 if env['WITH_BF_OPENJPEG']:
-	defs.append('WITH_OPENJPEG')
+    defs.append('WITH_OPENJPEG')
 
 if env['WITH_BF_DDS']:
-	defs.append('WITH_DDS')
+    defs.append('WITH_DDS')
 
 if env['WITH_BF_CINEON']:
-	defs.append('WITH_CINEON')
+    defs.append('WITH_CINEON')
 
 if env['WITH_BF_HDR']:
-	defs.append('WITH_HDR')
+    defs.append('WITH_HDR')
 
 if env['WITH_BF_FFMPEG']:
-	defs.append('WITH_FFMPEG')
-	incs += ' ' + env['BF_FFMPEG_INC']
+    defs.append('WITH_FFMPEG')
+    incs += ' ' + env['BF_FFMPEG_INC']
 
 if env['WITH_BF_QUICKTIME']:
-	defs.append('WITH_QUICKTIME')
-	incs += ' ' + env['BF_QUICKTIME_INC']
+    defs.append('WITH_QUICKTIME')
+    incs += ' ' + env['BF_QUICKTIME_INC']
 
 if env['WITH_BF_BULLET']:
-	defs.append('USE_BULLET')
+    defs.append('USE_BULLET')
 
 if env['OURPLATFORM'] == 'darwin':
     if env['WITH_BF_OPENMP']:
        defs.append('PARALLEL=1')
 
 if env['BF_NO_ELBEEM']:
-	defs.append('DISABLE_ELBEEM')
+    defs.append('DISABLE_ELBEEM')
 
 if env['WITH_BF_LCMS']:
-	defs.append('WITH_LCMS')
-	incs += ' ' + env['BF_LCMS_INC']
+    defs.append('WITH_LCMS')
+    incs += ' ' + env['BF_LCMS_INC']
 
 if env['WITH_BF_LZO']:
-	incs += ' #/extern/lzo/minilzo'
-	defs.append('WITH_LZO')
+    incs += ' #/extern/lzo/minilzo'
+    defs.append('WITH_LZO')
 
 if env['WITH_BF_LZMA']:
-	incs += ' #/extern/lzma'
-	defs.append('WITH_LZMA')
+    incs += ' #/extern/lzma'
+    defs.append('WITH_LZMA')
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
diff --git a/source/blender/blenpluginapi/SConscript b/source/blender/blenpluginapi/SConscript
index b310bcb95ec..680ae79f461 100644
--- a/source/blender/blenpluginapi/SConscript
+++ b/source/blender/blenpluginapi/SConscript
@@ -8,8 +8,8 @@ incs = '. .. #/intern/guardedalloc ../blenlib ../imbuf ../makesdna'
 defs = []
 
 if env['WITH_BF_QUICKTIME']:
-	defs.append('WITH_QUICKTIME')
-	incs += ' ' + env['BF_QUICKTIME_INC']
+    defs.append('WITH_QUICKTIME')
+    incs += ' ' + env['BF_QUICKTIME_INC']
 
 if env['OURPLATFORM'] == 'linux2':
     cflags='-pthread'
diff --git a/source/blender/collada/SConscript b/source/blender/collada/SConscript
index 09402dcda64..e026f2fb022 100644
--- a/source/blender/collada/SConscript
+++ b/source/blender/collada/SConscript
@@ -32,11 +32,11 @@ defs = []
 
 # relative paths to include dirs, space-separated, string
 if  env['OURPLATFORM']=='darwin':
-	incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
+    incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
 else:
-	incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
+    incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
 
 if env['BF_BUILDINFO']:
-	defs.append('NAN_BUILDINFO')
+    defs.append('NAN_BUILDINFO')
 
 env.BlenderLib ('bf_collada', sources, Split(incs), defs, libtype='core', priority=200 )
diff --git a/source/blender/editors/SConscript b/source/blender/editors/SConscript
index 226e9247f91..e8159bdf03f 100644
--- a/source/blender/editors/SConscript
+++ b/source/blender/editors/SConscript
@@ -3,38 +3,38 @@ Import ('env')
 
 
 SConscript(['datafiles/SConscript',
-			'space_api/SConscript',
-			'util/SConscript',
-			'interface/SConscript',
-			'animation/SConscript',
-			'armature/SConscript',
-			'mesh/SConscript',
-			'metaball/SConscript',
-			'object/SConscript',
-			'curve/SConscript',
-			'gpencil/SConscript',
-			'physics/SConscript',
-			'render/SConscript',
-			'sound/SConscript',
-			'space_buttons/SConscript',
-			'space_file/SConscript',
-			'space_image/SConscript',
-			'space_info/SConscript',
-			'space_graph/SConscript',
-			'space_node/SConscript',
-			'space_outliner/SConscript',
-			'space_time/SConscript',
-			'space_view3d/SConscript',
-			'space_sound/SConscript',
-			'space_action/SConscript',
-			'space_nla/SConscript',
-			'space_script/SConscript',
-			'space_text/SConscript',
-			'space_sequencer/SConscript',
-			'space_logic/SConscript',
-			'space_console/SConscript',
-			'space_userpref/SConscript',
-			'transform/SConscript',
-			'screen/SConscript',
-			'sculpt_paint/SConscript',
-			'uvedit/SConscript'])
+            'space_api/SConscript',
+            'util/SConscript',
+            'interface/SConscript',
+            'animation/SConscript',
+            'armature/SConscript',
+            'mesh/SConscript',
+            'metaball/SConscript',
+            'object/SConscript',
+            'curve/SConscript',
+            'gpencil/SConscript',
+            'physics/SConscript',
+            'render/SConscript',
+            'sound/SConscript',
+            'space_buttons/SConscript',
+            'space_file/SConscript',
+            'space_image/SConscript',
+            'space_info/SConscript',
+            'space_graph/SConscript',
+            'space_node/SConscript',
+            'space_outliner/SConscript',
+            'space_time/SConscript',
+            'space_view3d/SConscript',
+            'space_sound/SConscript',
+            'space_action/SConscript',
+            'space_nla/SConscript',
+            'space_script/SConscript',
+            'space_text/SConscript',
+            'space_sequencer/SConscript',
+            'space_logic/SConscript',
+            'space_console/SConscript',
+            'space_userpref/SConscript',
+            'transform/SConscript',
+            'screen/SConscript',
+            'sculpt_paint/SConscript',
+            'uvedit/SConscript'])
diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript
index 09868345fc4..81964a661a4 100644
--- a/source/blender/editors/interface/SConscript
+++ b/source/blender/editors/interface/SConscript
@@ -4,7 +4,7 @@ Import ('env')
 sources = env.Glob('*.c')
 
 for source in env.Glob('*_api.c'):
-	sources.remove(source)
+    sources.remove(source)
 
 incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc ../../gpu'
@@ -17,6 +17,6 @@ if env['WITH_BF_INTERNATIONAL']:
     defs.append('INTERNATIONAL')
 
 if not env['WITH_BF_PYTHON']:
-	defs.append('DISABLE_PYTHON')
-	
+    defs.append('DISABLE_PYTHON')
+    
 env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), defs, libtype=['core'], priority=[110] )
diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript
index 0a94de255cb..98085dd2fe5 100644
--- a/source/blender/editors/object/SConscript
+++ b/source/blender/editors/object/SConscript
@@ -18,6 +18,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
 if not env['WITH_BF_PYTHON']:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 env.BlenderLib ( 'bf_editors_object', sources, Split(incs), defs, libtype=['core'], priority=[35] )
diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript
index 6efb2617a18..9049ac876df 100644
--- a/source/blender/editors/screen/SConscript
+++ b/source/blender/editors/screen/SConscript
@@ -11,10 +11,10 @@ incs += ' #/intern/guardedalloc #/extern/glew/include'
 defs = ''
 
 if env['OURPLATFORM'] == 'linux2':
-	cflags='-pthread'
-    	incs += ' ../../../extern/binreloc/include'
+    cflags='-pthread'
+        incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
-	incs += ' ' + env['BF_PTHREADS_INC']
+    incs += ' ' + env['BF_PTHREADS_INC']
 
 env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), Split(defs), libtype=['core'], priority=[105] )
diff --git a/source/blender/editors/sculpt_paint/SConscript b/source/blender/editors/sculpt_paint/SConscript
index 3d9a5144c93..c694e826817 100644
--- a/source/blender/editors/sculpt_paint/SConscript
+++ b/source/blender/editors/sculpt_paint/SConscript
@@ -11,8 +11,8 @@ incs += ' ../../render/extern/include'
 incs += ' ../../gpu ../../makesrna'
 
 if env['OURPLATFORM'] == 'linux2':
-	cflags='-pthread'
-    	incs += ' ../../../extern/binreloc/include'
+    cflags='-pthread'
+        incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] == 'linuxcross':
     if env['WITH_BF_OPENMP']:
diff --git a/source/blender/editors/space_console/SConscript b/source/blender/editors/space_console/SConscript
index d50902446ba..087090a7740 100644
--- a/source/blender/editors/space_console/SConscript
+++ b/source/blender/editors/space_console/SConscript
@@ -5,19 +5,19 @@ sources = env.Glob('*.c')
 defs = []
 
 incs = [
-	'../include',
-	'#extern/glew/include',
-	'#/intern/guardedalloc',
-	'../../makesdna',
-	'../../makesrna',
-	'../../blenkernel',
-	'../../blenlib',
-	'../../windowmanager',
-	'../../blenfont',
-	'../../blenloader',
+    '../include',
+    '#extern/glew/include',
+    '#/intern/guardedalloc',
+    '../../makesdna',
+    '../../makesrna',
+    '../../blenkernel',
+    '../../blenlib',
+    '../../windowmanager',
+    '../../blenfont',
+    '../../blenloader',
 ]
 
 if not env['WITH_BF_PYTHON']:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 env.BlenderLib ( 'bf_editors_space_console', sources, incs, defs, libtype=['core'], priority=[95] )
diff --git a/source/blender/editors/space_file/SConscript b/source/blender/editors/space_file/SConscript
index 9de705e99d3..7c55b40e816 100644
--- a/source/blender/editors/space_file/SConscript
+++ b/source/blender/editors/space_file/SConscript
@@ -14,10 +14,10 @@ if env['WITH_BF_OPENJPEG']:
     defs.append('WITH_OPENJPEG')
 
 if env['WITH_BF_OPENEXR']:
-	defs.append('WITH_OPENEXR')
+    defs.append('WITH_OPENEXR')
 
 if env['WITH_BF_TIFF']:
-	defs.append('WITH_TIFF')
+    defs.append('WITH_TIFF')
 
 if env['OURPLATFORM'] == 'linux2':
     cflags='-pthread'
diff --git a/source/blender/editors/space_image/SConscript b/source/blender/editors/space_image/SConscript
index 4e1918bc327..c7c31352185 100644
--- a/source/blender/editors/space_image/SConscript
+++ b/source/blender/editors/space_image/SConscript
@@ -10,12 +10,12 @@ incs += ' ../../render/extern/include ../../makesrna'
 defs = []
 
 if env['WITH_BF_LCMS']:
-	defs.append('WITH_LCMS')
-	incs += ' ' + env['BF_LCMS_INC']
+    defs.append('WITH_LCMS')
+    incs += ' ' + env['BF_LCMS_INC']
 if env['WITH_BF_OPENEXR']:
-	defs.append('WITH_OPENEXR')
+    defs.append('WITH_OPENEXR')
 if env['WITH_BF_TIFF']:
-	defs.append('WITH_TIFF')
+    defs.append('WITH_TIFF')
     
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
diff --git a/source/blender/editors/space_logic/SConscript b/source/blender/editors/space_logic/SConscript
index 307d229fb3f..0ce2eee575e 100644
--- a/source/blender/editors/space_logic/SConscript
+++ b/source/blender/editors/space_logic/SConscript
@@ -10,6 +10,6 @@ incs += ' ../../makesrna ../interface'
 defs = []
 
 if env['WITH_BF_GAMEENGINE']:
-	defs.append('GAMEBLENDER=1')
+    defs.append('GAMEBLENDER=1')
 
 env.BlenderLib ( 'bf_editors_space_game', sources, Split(incs), defs, libtype=['core'], priority=[120] )
diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript
index fd0dfe83852..636b247d44c 100644
--- a/source/blender/editors/space_node/SConscript
+++ b/source/blender/editors/space_node/SConscript
@@ -9,17 +9,17 @@ incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include'
 defs = []
 cf = []
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	#cf.append('/WX')
-	pass
+    #cf.append('/WX')
+    pass
 if env['CC'] == 'gcc':
-	#cf.append('-Werror')
-	pass
+    #cf.append('-Werror')
+    pass
 
 if env['OURPLATFORM'] == 'linux2':
-	cflags='-pthread'
-	incs += ' ../../../extern/binreloc/include'
+    cflags='-pthread'
+    incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
-	incs += ' ' + env['BF_PTHREADS_INC']
+    incs += ' ' + env['BF_PTHREADS_INC']
 
 env.BlenderLib ( 'bf_editors_space_node', sources, Split(incs), defs, libtype=['core'], priority=[55], compileflags=cf )
diff --git a/source/blender/editors/space_script/SConscript b/source/blender/editors/space_script/SConscript
index a78f1a66762..f187df19117 100644
--- a/source/blender/editors/space_script/SConscript
+++ b/source/blender/editors/space_script/SConscript
@@ -11,6 +11,6 @@ incs += ' ../../python'
 defs = []
 
 if not env['WITH_BF_PYTHON']:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 env.BlenderLib ( 'bf_editors_space_script', sources, Split(incs), defs, libtype=['core'], priority=[90] )
diff --git a/source/blender/editors/space_text/SConscript b/source/blender/editors/space_text/SConscript
index 09ba961bfce..bd87a799756 100644
--- a/source/blender/editors/space_text/SConscript
+++ b/source/blender/editors/space_text/SConscript
@@ -8,6 +8,6 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../python ../../makesrna ../../blenfont'
 
 if not env['WITH_BF_PYTHON']:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 env.BlenderLib ( 'bf_editors_space_text', sources, Split(incs), defs, libtype=['core'], priority=[95] )
diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript
index 1d8e01f2b1b..d9074113ba9 100644
--- a/source/blender/editors/space_view3d/SConscript
+++ b/source/blender/editors/space_view3d/SConscript
@@ -12,8 +12,8 @@ incs += ' #/intern/smoke/extern'
 incs += ' #source/kernel/gen_system'
 
 if env['WITH_BF_GAMEENGINE']:
-	defs.append('GAMEBLENDER=1')
+    defs.append('GAMEBLENDER=1')
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
-	incs += ' ' + env['BF_PTHREADS_INC']
+    incs += ' ' + env['BF_PTHREADS_INC']
 
 env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), defines = defs, libtype=['core'], priority=[40] )
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index 6b3360a16c5..c5c08a2856a 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -45,7 +45,7 @@ if env['WITH_BF_REDCODE']:
     incs += ' ' + env['BF_REDCODE_INC']
 
 if env['WITH_BF_QUICKTIME']:
-	incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
-	defs.append('WITH_QUICKTIME')
+    incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
+    defs.append('WITH_QUICKTIME')
 
 env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [185,115] )
diff --git a/source/blender/imbuf/intern/dds/SConscript b/source/blender/imbuf/intern/dds/SConscript
index 0b7fd50e317..59509c88f03 100644
--- a/source/blender/imbuf/intern/dds/SConscript
+++ b/source/blender/imbuf/intern/dds/SConscript
@@ -4,14 +4,14 @@ Import ('env')
 source_files = ['dds_api.cpp', 'DirectDrawSurface.cpp', 'Stream.cpp', 'BlockDXT.cpp', 'ColorBlock.cpp', 'Image.cpp']
 
 incs = ['.',
-	'../../',
-	'../..',
-	'..',
-	'../../../makesdna',
-	'../../../blenkernel',
-	'../../../blenlib',
-	'intern/include',
-	'#/intern/guardedalloc']
+    '../../',
+    '../..',
+    '..',
+    '../../../makesdna',
+    '../../../blenkernel',
+    '../../../blenlib',
+    'intern/include',
+    '#/intern/guardedalloc']
 
 
 defs = ['WITH_DDS']
diff --git a/source/blender/imbuf/intern/openexr/SConscript b/source/blender/imbuf/intern/openexr/SConscript
index f504c503109..47f83868baa 100644
--- a/source/blender/imbuf/intern/openexr/SConscript
+++ b/source/blender/imbuf/intern/openexr/SConscript
@@ -4,13 +4,13 @@ Import ('env')
 source_files = ['openexr_api.cpp']
 
 incs = ['.',
-	'../../../blenkernel',
-	'../../',
-	'..',
-	'../../../blenlib',
-	'intern/include',
-	'#/intern/guardedalloc',
-	'../../../makesdna']
+    '../../../blenkernel',
+    '../../',
+    '..',
+    '../../../blenlib',
+    'intern/include',
+    '#/intern/guardedalloc',
+    '../../../makesdna']
 incs += Split(env['BF_OPENEXR_INC'])
 
 defs = ['WITH_OPENEXR']
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript
index 78f5fcaba69..d4836631104 100644
--- a/source/blender/makesdna/intern/SConscript
+++ b/source/blender/makesdna/intern/SConscript
@@ -3,7 +3,7 @@ import sys
 import os
 
 def normpath(path):
-	return os.path.abspath(os.path.normpath(path))
+    return os.path.abspath(os.path.normpath(path))
 
 Import ('env')
 cflags = ''
@@ -18,21 +18,21 @@ dna = env.Clone()
 makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ')
 
 makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc',
-								 '../../makesdna'])
+                                 '../../makesdna'])
 
 if env['OURPLATFORM'] == 'linuxcross':
-	USE_WINE = True # when cross compiling on linux 64bit this is useful
+    USE_WINE = True # when cross compiling on linux 64bit this is useful
 else:
-	USE_WINE = False
+    USE_WINE = False
 
 if not USE_WINE:
-	if env['OURPLATFORM'] == 'linuxcross':
-		makesdna_tool.Replace(CC='gcc')
-		makesdna_tool.Replace(AR='ar')
-		makesdna_tool.Replace(LINK='gcc')
+    if env['OURPLATFORM'] == 'linuxcross':
+        makesdna_tool.Replace(CC='gcc')
+        makesdna_tool.Replace(AR='ar')
+        makesdna_tool.Replace(LINK='gcc')
 
 if sys.platform != 'cygwin':
-	makesdna_tool.Append (CCFLAGS = cflags)
+    makesdna_tool.Append (CCFLAGS = cflags)
 makesdna_tool.Append (CPPDEFINES = defines)
 makesdna_tool.Append( CFLAGS = env['CFLAGS'])
 makesdna_tool.Append( CCFLAGS = env['CCFLAGS'])
@@ -40,15 +40,15 @@ makesdna_tool.Append( LINKFLAGS = env['PLATFORM_LINKFLAGS'])
 targetdir = normpath(root_build_dir+'/lib')
 
 if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
-	targetdir = '#'+targetdir
+    targetdir = '#'+targetdir
 makesdna_tool.Append (LIBPATH = targetdir)
 if env['BF_PROFILE']:
-	makesdna_tool.Append (LINKFLAGS = env['BF_PROFILE_LINKFLAGS'])
+    makesdna_tool.Append (LINKFLAGS = env['BF_PROFILE_LINKFLAGS'])
 
 targetdir = normpath(root_build_dir + '/makesdna')
 
 if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
-	targetdir = '#' + targetdir
+    targetdir = '#' + targetdir
 
 makesdna = makesdna_tool.Program (target = targetdir, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_blenlib'])
 
@@ -57,15 +57,15 @@ dna.Depends ('dna.c', makesdna)
 dna.Depends ('dna.c', header_files)
 
 if env['OURPLATFORM'] != 'linuxcross':
-	if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
-		dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET")
-	else:
-		dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET")
+    if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
+        dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET")
+    else:
+        dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET")
 else:
-	if USE_WINE:
-		dna.Command ('dna.c', '', 'wine ' + root_build_dir+os.sep+"makesdna $TARGET")
-	else:
-		dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna.exe $TARGET")
+    if USE_WINE:
+        dna.Command ('dna.c', '', 'wine ' + root_build_dir+os.sep+"makesdna $TARGET")
+    else:
+        dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna.exe $TARGET")
 
 obj = ['intern/dna.c', 'intern/dna_genfile.c']
 Return ('obj')
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index 7ac76c4d107..674aeb264c3 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -13,52 +13,52 @@ incs += ' ../render/extern/include'
 defs = []
 
 if env['WITH_BF_OPENEXR']:
-	defs.append('WITH_OPENEXR')
+    defs.append('WITH_OPENEXR')
 
 if env['WITH_BF_TIFF']:
-	defs.append('WITH_TIFF')
+    defs.append('WITH_TIFF')
 
 if env['WITH_BF_OPENJPEG']:
-	defs.append('WITH_OPENJPEG')
+    defs.append('WITH_OPENJPEG')
 
 if env['WITH_BF_DDS']:
-	defs.append('WITH_DDS')
+    defs.append('WITH_DDS')
 
 if env['WITH_BF_CINEON']:
-	defs.append('WITH_CINEON')
+    defs.append('WITH_CINEON')
 
 if env['WITH_BF_HDR']:
-	defs.append('WITH_HDR')
+    defs.append('WITH_HDR')
 
 if env['WITH_BF_FFMPEG']:
-	defs.append('WITH_FFMPEG')
-	incs += ' ' + env['BF_FFMPEG_INC']
+    defs.append('WITH_FFMPEG')
+    incs += ' ' + env['BF_FFMPEG_INC']
 
 if env['WITH_BF_OGG']:
-	defs.append('WITH_OGG')
+    defs.append('WITH_OGG')
 
 if env['WITH_BF_QUICKTIME']:
-	defs.append('WITH_QUICKTIME')
-	incs += ' ../quicktime'
+    defs.append('WITH_QUICKTIME')
+    incs += ' ../quicktime'
 
 if env['WITH_BF_LCMS']:
-	defs.append('WITH_LCMS')
-	incs += ' ' + env['BF_LCMS_INC']
-	
+    defs.append('WITH_LCMS')
+    incs += ' ' + env['BF_LCMS_INC']
+    
 if env['WITH_BF_GAMEENGINE']:
-	defs.append('GAMEBLENDER=1')
+    defs.append('GAMEBLENDER=1')
 
 if env['BF_UNIT_TEST']:
-	defs.append('UNIT_TEST')
+    defs.append('UNIT_TEST')
 
 if not env['WITH_BF_PYTHON']:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 if env['OURPLATFORM'] == 'linux2':
-	cflags='-pthread'
-	incs += ' ../../../extern/binreloc/include'
+    cflags='-pthread'
+    incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
-	incs += ' ' + env['BF_PTHREADS_INC']
+    incs += ' ' + env['BF_PTHREADS_INC']
 
 env.BlenderLib ( 'bf_rna', objs, Split(incs), defines=defs, libtype=['core','player'], priority = [165,20] )
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 32ff64e609f..ecee3f94796 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -3,7 +3,7 @@ import sys
 import os
 
 def normpath(path):
-	return os.path.abspath(os.path.normpath(path))
+    return os.path.abspath(os.path.normpath(path))
 
 Import ('env')
 cflags = ['-Wall']
@@ -36,40 +36,40 @@ incs += ' ../../render/extern/include'
 incs += ' #/intern/audaspace/intern '
 
 if env['WITH_BF_OPENEXR']:
-	defs.append('WITH_OPENEXR')
+    defs.append('WITH_OPENEXR')
 
 if env['WITH_BF_TIFF']:
     defs.append('WITH_TIFF')
 
 if env['WITH_BF_OPENJPEG']:
-	defs.append('WITH_OPENJPEG')
+    defs.append('WITH_OPENJPEG')
 
 if env['WITH_BF_DDS']:
-	defs.append('WITH_DDS')
+    defs.append('WITH_DDS')
 
 if env['WITH_BF_CINEON']:
-	defs.append('WITH_CINEON')
+    defs.append('WITH_CINEON')
 
 if env['WITH_BF_HDR']:
-	defs.append('WITH_HDR')
+    defs.append('WITH_HDR')
 
 if env['WITH_BF_FFMPEG']:
-	defs.append('WITH_FFMPEG')
-	incs += ' ' + env['BF_FFMPEG_INC']
+    defs.append('WITH_FFMPEG')
+    incs += ' ' + env['BF_FFMPEG_INC']
 
 if env['WITH_BF_OGG']:
-	defs.append('WITH_OGG')
+    defs.append('WITH_OGG')
 
 if env['WITH_BF_QUICKTIME']:
-	defs.append('WITH_QUICKTIME')
-	incs += ' ../../quicktime'
+    defs.append('WITH_QUICKTIME')
+    incs += ' ../../quicktime'
 
 if env['WITH_BF_LCMS']:
-	defs.append('WITH_LCMS')
+    defs.append('WITH_LCMS')
 
 if env['WITH_BF_GAMEENGINE']:
-	defs.append('GAMEBLENDER=1')
-	
+    defs.append('GAMEBLENDER=1')
+    
 if env['WITH_BF_FFTW3']:
     defs.append('FFTW3=1')
 
@@ -83,40 +83,40 @@ if env['WITH_BF_JACK']:
     defs.append('WITH_JACK')
 
 if env['BF_UNIT_TEST']:
-	defs.append('UNIT_TEST')
+    defs.append('UNIT_TEST')
 
 if not env['WITH_BF_PYTHON']:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 if env['OURPLATFORM'] == 'linux2':
-	cflags='-pthread'
-	incs += ' ../../../extern/binreloc/include'
+    cflags='-pthread'
+    incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
-	incs += ' ' + env['BF_PTHREADS_INC']
+    incs += ' ' + env['BF_PTHREADS_INC']
 
 makesrna_tool.Append(CPPDEFINES=defs)
 
 makesrna_tool.Append (CPPPATH = Split(incs))
 
 if env['OURPLATFORM'] == 'linuxcross':
-	USE_WINE = True # when cross compiling on linux 64bit this is useful
+    USE_WINE = True # when cross compiling on linux 64bit this is useful
 else:
-	USE_WINE = False
+    USE_WINE = False
 
 if not USE_WINE:
-	if env['OURPLATFORM'] == 'linuxcross':
-		makesdna_tool.Replace(CC='gcc')
-		makesdna_tool.Replace(AR='ar')
-		makesdna_tool.Replace(LINK='gcc')
+    if env['OURPLATFORM'] == 'linuxcross':
+        makesdna_tool.Replace(CC='gcc')
+        makesdna_tool.Replace(AR='ar')
+        makesdna_tool.Replace(LINK='gcc')
 
 if sys.platform != 'cygwin':
-	makesrna_tool.Append (CCFLAGS = cflags)
+    makesrna_tool.Append (CCFLAGS = cflags)
 makesrna_tool.Append (CPPDEFINES = defines)
 
 libdir = root_build_dir+'/lib'
 if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
-	libdir = '#' + libdir
+    libdir = '#' + libdir
 
 makesrna_tool.Append (LIBPATH = libdir)
 
@@ -125,46 +125,46 @@ makesrna_tool.Append( CCFLAGS = env['CCFLAGS'])
 makesrna_tool.Append( LINKFLAGS = env['PLATFORM_LINKFLAGS'])
 
 if env['BF_PROFILE']:
-	makesrna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS'])
+    makesrna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS'])
 
 if env['BF_DEBUG']:
-	makesrna_tool.Append(CFLAGS = env['BF_DEBUG_CFLAGS'])
-	makesrna_tool.Append(CCFLAGS = env['BF_DEBUG_CCFLAGS'])
-	if env['OURPLATFORM'] in ('win32-vc','win64-vc'):
-		makesrna_tool.Append(LINKFLAGS = ['/DEBUG','/PDB:makesrna.pdb'])
+    makesrna_tool.Append(CFLAGS = env['BF_DEBUG_CFLAGS'])
+    makesrna_tool.Append(CCFLAGS = env['BF_DEBUG_CCFLAGS'])
+    if env['OURPLATFORM'] in ('win32-vc','win64-vc'):
+        makesrna_tool.Append(LINKFLAGS = ['/DEBUG','/PDB:makesrna.pdb'])
 
 targetpath = root_build_dir+'/makesrna'
 if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
-	targetpath = '#' + targetpath
+    targetpath = '#' + targetpath
 
 if env['OURPLATFORM'] == 'linux2' and root_build_dir[0]==os.sep:
-	makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib'])
+    makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib'])
 else:
-	makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib'])
+    makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_intern_guardedalloc', 'bf_dna', 'bf_blenlib'])
 
 rna_dict = rna.Dictionary()
 rna.Depends (generated_files, makesrna)
 
 # this seems bad, how to retrieve it from scons?
 build_dir = root_build_dir + os.sep +'source' + os.sep + 'blender' + os.sep + 'makesrna' + os.sep + 'intern' + os.sep
-	
+    
 if env['OURPLATFORM'] != 'linuxcross':
-	if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
-		rna.Command (generated_files, '', "\"" + root_build_dir+os.sep+"makesrna.exe\" \""  + build_dir )
-	else:
-		rna.Command (generated_files, '', "\"" + root_build_dir+os.sep+"makesrna\" \""  + build_dir + '"' )
+    if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
+        rna.Command (generated_files, '', "\"" + root_build_dir+os.sep+"makesrna.exe\" \""  + build_dir )
+    else:
+        rna.Command (generated_files, '', "\"" + root_build_dir+os.sep+"makesrna\" \""  + build_dir + '"' )
 else:
-	rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna.exe "  + build_dir)
-	
-	if USE_WINE:
-		rna.Command (generated_files, '', 'wine ' + root_build_dir+os.sep+"makesrna.exe "  + build_dir)
-	else:
-		rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna.exe "  + build_dir)
+    rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna.exe "  + build_dir)
+    
+    if USE_WINE:
+        rna.Command (generated_files, '', 'wine ' + root_build_dir+os.sep+"makesrna.exe "  + build_dir)
+    else:
+        rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna.exe "  + build_dir)
 
 
 obj = ['intern/rna_access.c']
 for generated_file in generated_files:
-	obj += ['intern/' + generated_file]
+    obj += ['intern/' + generated_file]
 
 Return ('obj')
 
diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript
index 78ee16a3690..7aa198f51f0 100644
--- a/source/blender/modifiers/SConscript
+++ b/source/blender/modifiers/SConscript
@@ -13,7 +13,7 @@ incs += ' ' + env['BF_ZLIB_INC']
 defs = []
 
 if env['BF_NO_ELBEEM']:
-	defs.append('DISABLE_ELBEEM')
+    defs.append('DISABLE_ELBEEM')
 
 env.BlenderLib ( libname = 'bf_modifiers', sources = sources,
                  includes = Split(incs), defines=defs,
diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript
index 548f4973574..284c92bcf81 100644
--- a/source/blender/nodes/SConscript
+++ b/source/blender/nodes/SConscript
@@ -20,19 +20,19 @@ incs += ' ' + env['BF_ZLIB_INC']
 defs = [] 
 
 if env['WITH_BF_PYTHON']:
-	incs += ' ' + env['BF_PYTHON_INC']
-	incs += ' ../python'
-	if env['BF_DEBUG']:
-		defs.append('_DEBUG')
+    incs += ' ' + env['BF_PYTHON_INC']
+    incs += ' ../python'
+    if env['BF_DEBUG']:
+        defs.append('_DEBUG')
 else:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 if env['OURPLATFORM'] == 'linux2':
-	cflags='-pthread'
-    	incs += ' ../../../extern/binreloc/include'
+    cflags='-pthread'
+        incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
-	incs += ' ' + env['BF_PTHREADS_INC']
+    incs += ' ' + env['BF_PTHREADS_INC']
 
 env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [190,105] )
 env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index 097f69155d5..315fc5ca9a3 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -11,10 +11,10 @@ incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC']
 defs = []
 
 if env['BF_BUILDINFO']:
-	defs.append('BUILD_DATE')
+    defs.append('BUILD_DATE')
 
 if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']:
-	defs.append('_DEBUG')
+    defs.append('_DEBUG')
 
 env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [361,160])
 
diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript
index c8aeb70aa57..24dfab13fd9 100644
--- a/source/blender/quicktime/SConscript
+++ b/source/blender/quicktime/SConscript
@@ -11,20 +11,20 @@ else:
 
 
 incs  = ['.',
-		 '../quicktime',
-		 '../makesdna',
-		 '../makesrna',
-		 '../windowmanager',
-		 '#/intern/guardedalloc',
-		 '../blenlib',
-		 '../blenkernel',
-		 '../avi',
-		 '../imbuf',
-		 '../imbuf/intern',
-		 '../blenloader',
-		 '../render/extern/include',
-		 '../editors/include',
-		 '#/intern/audaspace/intern']
+         '../quicktime',
+         '../makesdna',
+         '../makesrna',
+         '../windowmanager',
+         '#/intern/guardedalloc',
+         '../blenlib',
+         '../blenkernel',
+         '../avi',
+         '../imbuf',
+         '../imbuf/intern',
+         '../blenloader',
+         '../render/extern/include',
+         '../editors/include',
+         '#/intern/audaspace/intern']
 
 incs.append(env['BF_QUICKTIME_INC'])
 
@@ -34,6 +34,6 @@ priorities = [200,235]
 defs=['WITH_QUICKTIME']
 
 if env['WITH_GHOST_COCOA']:
-	defs.append('GHOST_COCOA')
+    defs.append('GHOST_COCOA')
 
 env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities)
diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript
index 179b1ddc998..51168d7a9d3 100644
--- a/source/blender/windowmanager/SConscript
+++ b/source/blender/windowmanager/SConscript
@@ -17,22 +17,22 @@ incs += ' #/intern/elbeem #/extern/glew/include'
 defs = [ 'GLEW_STATIC' ]
 
 if not env['WITH_BF_PYTHON']:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 if env['WITH_BF_COLLADA']:
-	defs.append('WITH_COLLADA')
+    defs.append('WITH_COLLADA')
 
 if env['OURPLATFORM'] == 'linux2':
-	cflags='-pthread'
-	incs += ' ../../../extern/binreloc/include'
+    cflags='-pthread'
+    incs += ' ../../../extern/binreloc/include'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
-	incs += ' ' + env['BF_PTHREADS_INC']
+    incs += ' ' + env['BF_PTHREADS_INC']
 
 if env['WITH_GHOST_COCOA']:
-	sources.remove('intern/wm_apple.c')
+    sources.remove('intern/wm_apple.c')
 
 if env['BF_BUILDINFO']:
-	defs.append('NAN_BUILDINFO')
+    defs.append('NAN_BUILDINFO')
 
 env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defines=defs, libtype=['core'], priority=[5] )
diff --git a/source/blenderplayer/bad_level_call_stubs/SConscript b/source/blenderplayer/bad_level_call_stubs/SConscript
index aa84b88932e..aec5bb58ef7 100644
--- a/source/blenderplayer/bad_level_call_stubs/SConscript
+++ b/source/blenderplayer/bad_level_call_stubs/SConscript
@@ -11,6 +11,6 @@ if env['WITH_BF_INTERNATIONAL']:
     defs += 'WITH_FREETYPE2'
 
 if env['WITH_BF_GAMEENGINE']:
-	defs += ' GAMEBLENDER=1'
+    defs += ' GAMEBLENDER=1'
 
 env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype=['player'],priority=[220] )
diff --git a/source/creator/SConscript b/source/creator/SConscript
index 01e62d33269..6ee9aea29a5 100644
--- a/source/creator/SConscript
+++ b/source/creator/SConscript
@@ -13,37 +13,37 @@ incs += ' ' + env['BF_OPENGL_INC']
 
 defs = []
 if env['WITH_BF_QUICKTIME']:
-	incs += ' ' + env['BF_QUICKTIME_INC']
-	defs.append('WITH_QUICKTIME')
+    incs += ' ' + env['BF_QUICKTIME_INC']
+    defs.append('WITH_QUICKTIME')
 
 if env['WITH_BF_BINRELOC']:
-	incs += ' ../../extern/binreloc/include'
-	defs.append('WITH_BINRELOC')
+    incs += ' ../../extern/binreloc/include'
+    defs.append('WITH_BINRELOC')
 
 if env['WITH_BF_OPENEXR']:
-	defs.append('WITH_OPENEXR')
+    defs.append('WITH_OPENEXR')
 
 if env['WITH_BF_TIFF']:
-	defs.append('WITH_TIFF')
+    defs.append('WITH_TIFF')
 
 if not env['WITH_BF_SDL']:
-	defs.append('DISABLE_SDL')
+    defs.append('DISABLE_SDL')
 
 if env['WITH_BF_PYTHON']:
-	incs += ' ../blender/python'
-	if env['BF_DEBUG']:
-		defs.append('_DEBUG')
+    incs += ' ../blender/python'
+    if env['BF_DEBUG']:
+        defs.append('_DEBUG')
 else:
-	defs.append('DISABLE_PYTHON')
-	
+    defs.append('DISABLE_PYTHON')
+    
 if env['BF_BUILDINFO']:
-	defs.append('BUILD_DATE')
-	defs.append('NAN_BUILDINFO')
+    defs.append('BUILD_DATE')
+    defs.append('NAN_BUILDINFO')
     
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
-	incs += ' ' + env['BF_PTHREADS_INC']
+    incs += ' ' + env['BF_PTHREADS_INC']
 
 env.BlenderLib ( libname = 'bf_creator', sources = Split(sources), includes = Split(incs), defines = defs, libtype='core', priority = 0 )
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript
index e5b263ad930..f53fc509c6d 100644
--- a/source/gameengine/BlenderRoutines/SConscript
+++ b/source/gameengine/BlenderRoutines/SConscript
@@ -26,9 +26,9 @@ if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
 
 if env['WITH_BF_PYTHON']:
-	incs += ' ' + env['BF_PYTHON_INC']
+    incs += ' ' + env['BF_PYTHON_INC']
 else:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index 616c205732c..ab1d7574d89 100644
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -24,12 +24,12 @@ incs += ' #source/blender/ikplugin'
 incs += ' ' + env['BF_BULLET_INC']
 
 if env['BF_DEBUG']:
-	if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc', 'win64-vc'):
-		defs.append('_DEBUG')
-		
+    if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc', 'win64-vc'):
+        defs.append('_DEBUG')
+        
 if env['WITH_BF_PYTHON']:
-	incs += ' ' + env['BF_PYTHON_INC']
+    incs += ' ' + env['BF_PYTHON_INC']
 else:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript
index 94af9dcfec8..007d6373c77 100644
--- a/source/gameengine/Expressions/SConscript
+++ b/source/gameengine/Expressions/SConscript
@@ -8,8 +8,8 @@ incs ='. #source/kernel/gen_system #intern/guardedalloc #intern/string #intern/m
 defs = []
 
 if env['WITH_BF_PYTHON']:
-	incs += ' ' + env['BF_PYTHON_INC']
+    incs += ' ' + env['BF_PYTHON_INC']
 else:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 env.BlenderLib ( 'bf_expressions', sources, Split(incs), defs, libtype=['core','player'], priority = [360,80], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript
index 3840754ed06..507bb7f0bdd 100644
--- a/source/gameengine/GameLogic/SConscript
+++ b/source/gameengine/GameLogic/SConscript
@@ -10,17 +10,17 @@ incs += ' #/source/gameengine/Rasterizer #/source/gameengine/SceneGraph'
 defs = []
 
 if env['WITH_BF_SDL']:
-	incs += ' ' + env['BF_SDL_INC']
+    incs += ' ' + env['BF_SDL_INC']
 else:
-	defs.append('DISABLE_SDL')
+    defs.append('DISABLE_SDL')
 
 if env['WITH_BF_PYTHON']:
-	incs += ' ' + env['BF_PYTHON_INC']
+    incs += ' ' + env['BF_PYTHON_INC']
 else:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	if env['BF_DEBUG']:
-		defs.append('_DEBUG')
+    if env['BF_DEBUG']:
+        defs.append('_DEBUG')
 
 env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330,65], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript
index b66d644f9f5..7a16e950b36 100644
--- a/source/gameengine/GamePlayer/common/SConscript
+++ b/source/gameengine/GamePlayer/common/SConscript
@@ -42,7 +42,7 @@ incs = ['.',
         '#source/blender/misc',
         '#source/blender/blenloader',
         '#source/blender/gpu',
-		'#extern/glew/include']
+        '#extern/glew/include']
 
 #This is all plugin stuff!
 #if sys.platform=='win32':
@@ -61,9 +61,9 @@ incs = ['.',
 defs = [ 'GLEW_STATIC' ]
 
 if env['WITH_BF_PYTHON']:
-	incs += Split(env['BF_PYTHON_INC'])
+    incs += Split(env['BF_PYTHON_INC'])
 else:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 incs += Split(env['BF_PNG_INC'])
 incs += Split(env['BF_ZLIB_INC'])
diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript
index 2269b6400e3..41520a06c66 100644
--- a/source/gameengine/GamePlayer/ghost/SConscript
+++ b/source/gameengine/GamePlayer/ghost/SConscript
@@ -43,9 +43,9 @@ incs = ['.',
 defs = [ 'GLEW_STATIC' ]
 
 if env['WITH_BF_PYTHON']:
-	incs += Split(env['BF_PYTHON_INC'])
+    incs += Split(env['BF_PYTHON_INC'])
 else:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript
index 64d00489c89..e7f98ff5850 100644
--- a/source/gameengine/Ketsji/KXNetwork/SConscript
+++ b/source/gameengine/Ketsji/KXNetwork/SConscript
@@ -10,8 +10,8 @@ incs += ' #source/gameengine/Network #source/gameengine/SceneGraph'
 defs = []
 
 if env['WITH_BF_PYTHON']:
-	incs += ' ' + env['BF_PYTHON_INC']
+    incs += ' ' + env['BF_PYTHON_INC']
 else:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 env.BlenderLib ( 'bf_network', Split(sources), Split(incs), defines=defs,libtype=['core','player'], priority=[400,125], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index 58dc8a314bf..8d54452be0d 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -26,18 +26,18 @@ incs += ' ' + env['BF_OPENGL_INC']
 if  env['WITH_BF_SDL']:
     incs += ' ' + env['BF_SDL_INC']
 else:
-	defs.append('DISABLE_SDL')
+    defs.append('DISABLE_SDL')
 
 if env['WITH_BF_PYTHON']:
-	incs += ' ' + env['BF_PYTHON_INC']
+    incs += ' ' + env['BF_PYTHON_INC']
 else:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 if env['WITH_BF_FFMPEG']:
-	defs.append('WITH_FFMPEG')
-	
+    defs.append('WITH_FFMPEG')
+    
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
-	if env['BF_DEBUG']:
-		defs.append('_DEBUG') # for Python
+    if env['BF_DEBUG']:
+        defs.append('_DEBUG') # for Python
 
 env.BlenderLib ( 'bf_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320,45], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript
index 976c6825351..f58085ab354 100644
--- a/source/gameengine/Physics/Bullet/SConscript
+++ b/source/gameengine/Physics/Bullet/SConscript
@@ -23,8 +23,8 @@ incs += ' ' + env['BF_BULLET_INC']
 defs = []
 
 if env['WITH_BF_PYTHON']:
-	incs += ' ' + env['BF_PYTHON_INC']
+    incs += ' ' + env['BF_PYTHON_INC']
 else:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[350,50], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript
index 8bc99f1596e..a78a0289d98 100644
--- a/source/gameengine/Rasterizer/SConscript
+++ b/source/gameengine/Rasterizer/SConscript
@@ -9,8 +9,8 @@ incs = '. #intern/guardedalloc #source/kernel/gen_system #intern/string #intern/
 defs = [ 'GLEW_STATIC' ]
 
 if env['WITH_BF_PYTHON']:
-	incs += ' ' + env['BF_PYTHON_INC']
+    incs += ' ' + env['BF_PYTHON_INC']
 else:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), defs, libtype=['core','player'], priority=[350,70], cxx_compileflags=env['BGE_CXXFLAGS'])
diff --git a/source/gameengine/VideoTexture/SConscript b/source/gameengine/VideoTexture/SConscript
index 70c7dfc6d3a..21a5f8ce3fe 100644
--- a/source/gameengine/VideoTexture/SConscript
+++ b/source/gameengine/VideoTexture/SConscript
@@ -16,13 +16,13 @@ incs += ' #intern/guardedalloc #extern/glew/include'
 
 defs = [] 
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc','win32-mingw'):
-	if env['BF_DEBUG']:
-		defs.append('_DEBUG')
+    if env['BF_DEBUG']:
+        defs.append('_DEBUG')
 
 if env['WITH_BF_PYTHON']:
-	incs += ' ' + env['BF_PYTHON_INC']
+    incs += ' ' + env['BF_PYTHON_INC']
 else:
-	defs.append('DISABLE_PYTHON')
+    defs.append('DISABLE_PYTHON')
 
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
diff --git a/source/icons/SConscript b/source/icons/SConscript
index 5abb36aafea..ca6308781e9 100644
--- a/source/icons/SConscript
+++ b/source/icons/SConscript
@@ -2,8 +2,8 @@
 Import ('env')
 
 if env['OURPLATFORM'] == 'linuxcross':
-	source = 'linuxcrossblender.rcscons'
+    source = 'linuxcrossblender.rcscons'
 else:
-	source = 'winblender.rcscons'
+    source = 'winblender.rcscons'
 
 env.BlenderRes('winresource', source, ['core'], priority=[95])