[Bf-blender-cvs] [bf83ada] opensubdiv-modifier: OpenSubdiv: Fix cimpilation error with SCons

Sergey Sharybin noreply at git.blender.org
Mon Aug 4 16:50:54 CEST 2014


Commit: bf83adaa7340db99b0f37518b86ece54e03b4e5b
Author: Sergey Sharybin
Date:   Mon Aug 4 20:50:24 2014 +0600
Branches: opensubdiv-modifier
https://developer.blender.org/rBbf83adaa7340db99b0f37518b86ece54e03b4e5b

OpenSubdiv: Fix cimpilation error with SCons

===================================================================

M	SConstruct
M	source/blender/gpu/SConscript

===================================================================

diff --git a/SConstruct b/SConstruct
index a671d20..7df7c95 100644
--- a/SConstruct
+++ b/SConstruct
@@ -684,6 +684,7 @@ if B.targets != ['cudakernels']:
     data_to_c_simple("release/datafiles/preview_cycles.blend")
 
     # --- glsl ---
+    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_geometry.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")
diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript
index 6ea0af6..7e4e61d 100644
--- a/source/blender/gpu/SConscript
+++ b/source/blender/gpu/SConscript
@@ -66,6 +66,7 @@ if env['WITH_BF_OPENSUBDIV']:
 # generated data files
 import os
 sources.extend((
+    os.path.join(env['DATA_SOURCES'], "gpu_shader_geometry.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"),




More information about the Bf-blender-cvs mailing list