[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24751] trunk/blender/source/blender/ editors: Patch #19953: [2.5] repeated include entries in a number of SConscript files

[Joshua Leung]

Revision: 24751
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24751
Author:   aligorith
Date:     2009-11-22 07:22:53 +0100 (Sun, 22 Nov 2009)

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

Thanks for the patch Jeff Doyle (nfz)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/curve/SConscript
    trunk/blender/source/blender/editors/gpencil/SConscript
    trunk/blender/source/blender/editors/mesh/SConscript
    trunk/blender/source/blender/editors/metaball/SConscript
    trunk/blender/source/blender/editors/object/SConscript
    trunk/blender/source/blender/editors/physics/SConscript
    trunk/blender/source/blender/editors/render/SConscript
    trunk/blender/source/blender/editors/sculpt_paint/SConscript
    trunk/blender/source/blender/editors/sound/SConscript
    trunk/blender/source/blender/editors/space_view3d/SConscript
    trunk/blender/source/blender/editors/transform/SConscript

Modified: trunk/blender/source/blender/editors/curve/SConscript
===================================================================
--- trunk/blender/source/blender/editors/curve/SConscript	2009-11-22 06:20:56 UTC (rev 24750)
+++ trunk/blender/source/blender/editors/curve/SConscript	2009-11-22 06:22:53 UTC (rev 24751)
@@ -5,7 +5,7 @@
 
 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] )

Modified: trunk/blender/source/blender/editors/gpencil/SConscript
===================================================================
--- trunk/blender/source/blender/editors/gpencil/SConscript	2009-11-22 06:20:56 UTC (rev 24750)
+++ trunk/blender/source/blender/editors/gpencil/SConscript	2009-11-22 06:22:53 UTC (rev 24751)
@@ -5,7 +5,7 @@
 
 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] )

Modified: trunk/blender/source/blender/editors/mesh/SConscript
===================================================================
--- trunk/blender/source/blender/editors/mesh/SConscript	2009-11-22 06:20:56 UTC (rev 24750)
+++ trunk/blender/source/blender/editors/mesh/SConscript	2009-11-22 06:22:53 UTC (rev 24751)
@@ -5,7 +5,7 @@
 
 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':

Modified: trunk/blender/source/blender/editors/metaball/SConscript
===================================================================
--- trunk/blender/source/blender/editors/metaball/SConscript	2009-11-22 06:20:56 UTC (rev 24750)
+++ trunk/blender/source/blender/editors/metaball/SConscript	2009-11-22 06:22:53 UTC (rev 24751)
@@ -5,7 +5,7 @@
 
 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] )

Modified: trunk/blender/source/blender/editors/object/SConscript
===================================================================
--- trunk/blender/source/blender/editors/object/SConscript	2009-11-22 06:20:56 UTC (rev 24750)
+++ trunk/blender/source/blender/editors/object/SConscript	2009-11-22 06:22:53 UTC (rev 24751)
@@ -5,7 +5,6 @@
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc'
-incs += ' #/intern/guardedalloc'
 incs += ' ../../makesrna ../../python ../../ikplugin'
 
 defs = []

Modified: trunk/blender/source/blender/editors/physics/SConscript
===================================================================
--- trunk/blender/source/blender/editors/physics/SConscript	2009-11-22 06:20:56 UTC (rev 24750)
+++ trunk/blender/source/blender/editors/physics/SConscript	2009-11-22 06:22:53 UTC (rev 24751)
@@ -5,7 +5,7 @@
 
 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':

Modified: trunk/blender/source/blender/editors/render/SConscript
===================================================================
--- trunk/blender/source/blender/editors/render/SConscript	2009-11-22 06:20:56 UTC (rev 24750)
+++ trunk/blender/source/blender/editors/render/SConscript	2009-11-22 06:22:53 UTC (rev 24751)
@@ -5,7 +5,7 @@
 
 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'
 

Modified: trunk/blender/source/blender/editors/sculpt_paint/SConscript
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/SConscript	2009-11-22 06:20:56 UTC (rev 24750)
+++ trunk/blender/source/blender/editors/sculpt_paint/SConscript	2009-11-22 06:22:53 UTC (rev 24751)
@@ -5,7 +5,7 @@
 
 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':

Modified: trunk/blender/source/blender/editors/sound/SConscript
===================================================================
--- trunk/blender/source/blender/editors/sound/SConscript	2009-11-22 06:20:56 UTC (rev 24750)
+++ trunk/blender/source/blender/editors/sound/SConscript	2009-11-22 06:22:53 UTC (rev 24751)
@@ -5,7 +5,6 @@
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc'
-incs += ' #/intern/guardedalloc'
 incs += ' ../../makesrna ../../python'
 incs += ' #/intern/audaspace/intern'
 

Modified: trunk/blender/source/blender/editors/space_view3d/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/SConscript	2009-11-22 06:20:56 UTC (rev 24750)
+++ trunk/blender/source/blender/editors/space_view3d/SConscript	2009-11-22 06:22:53 UTC (rev 24751)
@@ -6,7 +6,7 @@
 
 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'

Modified: trunk/blender/source/blender/editors/transform/SConscript
===================================================================
--- trunk/blender/source/blender/editors/transform/SConscript	2009-11-22 06:20:56 UTC (rev 24750)
+++ trunk/blender/source/blender/editors/transform/SConscript	2009-11-22 06:22:53 UTC (rev 24751)
@@ -5,7 +5,7 @@
 
 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