Another big code clean-up patch by Bastien Montagne (GPL headers, indentation,

spaces around operators, and so forth).  Many thanks!

1 files changed, 28 insertions, 35 deletions

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 281accc7629..11b45acafaf 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -7,76 +7,69 @@ defs = []
 incs = ''
 
 incs += '../blenkernel ../blenloader ../blenlib ../imbuf ../makesdna ../makesrna'
-incs += ' ../python ../python/intern'
-incs += ' ../render/extern/include ../render/intern/include'
+incs += ' ../python ../python/intern ../render/extern/include ../render/intern/include'
 incs += ' #/extern/glew/include #/intern/guardedalloc ../freestyle'
-incs += ' ' + env['BF_PYTHON_INC']	
+incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_PNG_INC']
 
-
 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']
 
 ########################################################
-#	folders sources 
+#   folders sources
 ########################################################
 
-#	system
+#   system
 prefix = 'intern/system'
 system_sources = env.Glob(prefix + '/*.cpp')
 
-#	image
+#   image
 prefix = 'intern/image'
 image_sources = env.Glob(prefix + '/*.cpp')
 
-#	geometry
+#   geometry
 prefix = 'intern/geometry'
 geometry_sources = env.Glob(prefix + '/*.cpp')
 
-#	scene_graph
+#   scene_graph
 prefix = 'intern/scene_graph'
 scene_graph_sources = env.Glob(prefix + '/*.cpp')
 
-#	winged_edge
+#   winged_edge
 prefix = 'intern/winged_edge'
 winged_edge_sources = env.Glob(prefix + '/*.cpp')
 
-#	view_map
+#   view_map
 prefix = 'intern/view_map'
 view_map_sources = env.Glob(prefix + '/*.cpp')
 
-#	stroke
+#   stroke
 prefix = 'intern/stroke'
 stroke_sources = env.Glob(prefix + '/*.cpp')
 
-# 	application
+#   application
 prefix = 'intern/application'
 application_sources = env.Glob(prefix + '/*.cpp')
 
-# 	blender_interface
+#   blender_interface
 prefix = 'intern/blender_interface'
 interface_sources = env.Glob(prefix + '/*.cpp')
 
-#	Python
+#   Python
 prefix = 'intern/python'
-python_sources =  env.Glob(prefix + '/*.cpp') \
-				+ env.Glob(prefix + '/*/*.cpp') \
-				+ env.Glob(prefix + '/*/*/*.cpp') \
-				+ env.Glob(prefix + '/*/*/*/*.cpp')
-
-sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources \
-		  + winged_edge_sources + view_map_sources + stroke_sources \
-		  + application_sources + interface_sources + python_sources
-
-env.BlenderLib (libname="bf_freestyle",
-				sources=sources,
-                includes=Split(incs),
-                defines=defs,
-				libtype=['core'],
-                priority = [370] # bf_python is 361
- )
-
+python_sources = env.Glob(prefix + '/*.cpp') + \
+                 env.Glob(prefix + '/*/*.cpp') + \
+                 env.Glob(prefix + '/*/*/*.cpp') + \
+                 env.Glob(prefix + '/*/*/*/*.cpp')
+
+sources = system_sources + image_sources + geometry_sources + scene_graph_sources + \
+          winged_edge_sources + view_map_sources + stroke_sources + \
+          application_sources + interface_sources + python_sources
+
+env.BlenderLib(libname="bf_freestyle", sources=sources, includes=Split(incs),
+               defines=defs, libtype=['core'], priority = [370] # bf_python is 361
+)