Patch #19953: [2.5] repeated include entries in a number of SConscript files

Thanks for the patch Jeff Doyle (nfz)

diff --git a/source/blender/editors/curve/SConscript b/source/blender/editors/curve/SConscript
index 3a1930899d3f52c0694cd4e0a3c46cd57b70b016..f72fc6c88636c326a38bedf43326d2508f183d57 100644 (file)
--- a/source/blender/editors/curve/SConscript
+++ b/source/blender/editors/curve/SConscript
@@ -5,7 +5,7 @@ sources = env.Glob('*.c')
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' #/intern/guardedalloc ../../gpu'
+incs += ' ../../gpu'
 incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
 
 env.BlenderLib ( 'bf_editors_curve', sources, Split(incs), [], libtype=['core'], priority=[45] )

diff --git a/source/blender/editors/gpencil/SConscript b/source/blender/editors/gpencil/SConscript
index af3cbdb901dbac60c297c73ceb021c190b357975..06d78d1e7e08cd2663052570007dc1ec60ea3d8a 100644 (file)
--- a/source/blender/editors/gpencil/SConscript
+++ b/source/blender/editors/gpencil/SConscript
@@ -5,7 +5,7 @@ sources = env.Glob('*.c')
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' #/intern/guardedalloc ../../gpu'
+incs += ' ../../gpu'
 incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
 
 env.BlenderLib ( 'bf_editors_gpencil', sources, Split(incs), [], libtype=['core'], priority=[45] )

diff --git a/source/blender/editors/mesh/SConscript b/source/blender/editors/mesh/SConscript
index 00391b3474a369bcd015e8ec57b28955ec9424c9..f5f8bb940e8440b7a93e546560a3f1dc6b383e0f 100644 (file)
--- a/source/blender/editors/mesh/SConscript
+++ b/source/blender/editors/mesh/SConscript
@@ -5,7 +5,7 @@ sources = env.Glob('*.c')
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' #/intern/guardedalloc ../../gpu'
+incs += ' ../../gpu'
 incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
 
 if env['OURPLATFORM'] == 'linux2':

diff --git a/source/blender/editors/metaball/SConscript b/source/blender/editors/metaball/SConscript
index 4b1b409063120b34b1c304bf606dc37f0fa317d5..e526a1560cf3b16798a3a24a196748612bdcca7e 100644 (file)
--- a/source/blender/editors/metaball/SConscript
+++ b/source/blender/editors/metaball/SConscript
@@ -5,7 +5,7 @@ sources = env.Glob('*.c')
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' #/intern/guardedalloc ../../gpu'
+incs += ' ../../gpu'
 incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
 
 env.BlenderLib ( 'bf_editors_metaball', sources, Split(incs), [], libtype=['core'], priority=[45] )

diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript
index 6ecc80f2d8147651b1932e5405cd5d9994ce62bb..06d68cd102168061153b98db4356a4a4b8a178b6 100644 (file)
--- a/source/blender/editors/object/SConscript
+++ b/source/blender/editors/object/SConscript
@@ -5,7 +5,6 @@ sources = env.Glob('*.c')
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc'
-incs += ' #/intern/guardedalloc'
 incs += ' ../../makesrna ../../python ../../ikplugin'
 
 defs = []

diff --git a/source/blender/editors/physics/SConscript b/source/blender/editors/physics/SConscript
index 60b992d2e07a559d0fcbdc1bfa07b74529a7009d..85a40c91b3a0ac33b974811887fe459fe8ba75b9 100644 (file)
--- a/source/blender/editors/physics/SConscript
+++ b/source/blender/editors/physics/SConscript
@@ -5,7 +5,7 @@ sources = env.Glob('*.c')
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' #/intern/guardedalloc ../../gpu'
+incs += ' ../../gpu'
 incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
 
 if env['OURPLATFORM'] == 'linux2':

diff --git a/source/blender/editors/render/SConscript b/source/blender/editors/render/SConscript
index bddc5ed10e032ad6b21805031d122553071525d4..b1b1165a1fe178be9845bd430e8a10bee0d5eaec 100644 (file)
--- a/source/blender/editors/render/SConscript
+++ b/source/blender/editors/render/SConscript
@@ -5,7 +5,7 @@ sources = env.Glob('*.c')
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' #/intern/guardedalloc ../../gpu'
+incs += ' ../../gpu'
 incs += ' ../../makesrna ../../render/extern/include  #/intern/elbeem/extern'
 incs += ' ../../blenloader'
 

diff --git a/source/blender/editors/sculpt_paint/SConscript b/source/blender/editors/sculpt_paint/SConscript
index 3d2ea89f506341bbf1528e3e8b536e6956f39b9f..472ba36105987b95b9c352dc729ac3cc22b2e912 100644 (file)
--- a/source/blender/editors/sculpt_paint/SConscript
+++ b/source/blender/editors/sculpt_paint/SConscript
@@ -5,7 +5,7 @@ sources = env.Glob('*.c')
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../render/extern/include #/intern/guardedalloc'
+incs += ' ../../render/extern/include'
 incs += ' ../../gpu ../../makesrna'
 
 if env['OURPLATFORM'] == 'linux2':

diff --git a/source/blender/editors/sound/SConscript b/source/blender/editors/sound/SConscript
index 7968f4c53a9177922251012c3f96c591e0536c76..9d2cd2b7cf58220cd02ce01c2434b1bf326c96e4 100644 (file)
--- a/source/blender/editors/sound/SConscript
+++ b/source/blender/editors/sound/SConscript
@@ -5,7 +5,6 @@ sources = env.Glob('*.c')
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc'
-incs += ' #/intern/guardedalloc'
 incs += ' ../../makesrna ../../python'
 incs += ' #/intern/audaspace/intern'
 

diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript
index 68e2ccb4e0682a85730b135d53128d1d3e462b87..ba521a5fb1af559c8888436d4f3bf91ed796d903 100644 (file)
--- a/source/blender/editors/space_view3d/SConscript
+++ b/source/blender/editors/space_view3d/SConscript
@@ -6,7 +6,7 @@ defs = [ 'GLEW_STATIC' ]
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../render/extern/include #/intern/guardedalloc'
+incs += ' ../../render/extern/include'
 incs += ' ../../gpu ../../makesrna ../../blenfont'
 incs += ' #/intern/smoke/extern'
 incs += ' #source/kernel/gen_system'

diff --git a/source/blender/editors/transform/SConscript b/source/blender/editors/transform/SConscript
index b2dee8c33589776ca100cda2a851da1242540e52..78945ff7d3a6f1c3599dce33e11de4003c512fc9 100644 (file)
--- a/source/blender/editors/transform/SConscript
+++ b/source/blender/editors/transform/SConscript
@@ -5,7 +5,7 @@ sources = env.Glob('*.c')
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../render/extern/include #/intern/guardedalloc'
+incs += ' ../../render/extern/include'
 incs += ' ../../gpu ../../makesrna'
 
 env.BlenderLib ( 'bf_editors_transform', sources, Split(incs), [], libtype=['core'], priority=[40] )
\ No newline at end of file