[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55433] branches/ge_harmony: The recent merge messed up some scons files.

[Daniel Stokes]

Revision: 55433
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55433
Author:   kupoman
Date:     2013-03-20 01:37:41 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
The recent merge messed up some scons files. This allows building Harmony with scons again.

Modified Paths:
--------------
    branches/ge_harmony/SConstruct
    branches/ge_harmony/source/blender/gpu/SConscript

Modified: branches/ge_harmony/SConstruct
===================================================================
--- branches/ge_harmony/SConstruct	2013-03-20 01:05:37 UTC (rev 55432)
+++ branches/ge_harmony/SConstruct	2013-03-20 01:37:41 UTC (rev 55433)
@@ -527,10 +527,13 @@
     data_to_c_simple("release/datafiles/preview_cycles.blend")
 
     # --- glsl ---
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_light_frag.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_light_vert.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_prepass_frag.glsl")
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_prepass_vert.glsl")
     data_to_c_simple("source/blender/gpu/shaders/gpu_shader_simple_frag.glsl")
     data_to_c_simple("source/blender/gpu/shaders/gpu_shader_simple_vert.glsl")
     data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
-    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
     data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl")
     data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl")
     data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")

Modified: branches/ge_harmony/source/blender/gpu/SConscript
===================================================================
--- branches/ge_harmony/source/blender/gpu/SConscript	2013-03-20 01:05:37 UTC (rev 55432)
+++ branches/ge_harmony/source/blender/gpu/SConscript	2013-03-20 01:37:41 UTC (rev 55433)
@@ -52,7 +52,8 @@
     os.path.join(env['DATA_SOURCES'], "gpu_shader_light_frag.glsl.c"),
     os.path.join(env['DATA_SOURCES'], "gpu_shader_light_vert.glsl.c"),
     os.path.join(env['DATA_SOURCES'], "gpu_shader_prepass_frag.glsl.c"),
-    os.path.join(env['DATA_SOURCES'], "gpu_shader_prepass_vert.glsl.c"),    os.path.join(env['DATA_SOURCES'], "gpu_shader_simple_frag.glsl.c"),
+    os.path.join(env['DATA_SOURCES'], "gpu_shader_prepass_vert.glsl.c"),    
+	os.path.join(env['DATA_SOURCES'], "gpu_shader_simple_frag.glsl.c"),
     os.path.join(env['DATA_SOURCES'], "gpu_shader_simple_vert.glsl.c"),
     os.path.join(env['DATA_SOURCES'], "gpu_shader_material.glsl.c"),
     os.path.join(env['DATA_SOURCES'], "gpu_shader_sep_gaussian_blur_frag.glsl.c"),