Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2018-10-16 22:54:59 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-10-17 03:24:33 +0300
commitdf816d534f195b9a38383e8b0dd806d0586a6fc0 (patch)
tree2ed79af5dd24d04a2fae0fbc6e83ffe8399f6a50 /source/blender
parentb618c185cb7c5930980e459c84b8818a0fba1f1d (diff)
Fix cmake not triggering rebuild on .glsl changes
At least on windows we do not re-run datatoc when the .glsl files change. To test is simple, just change edit_mesh_overlay_common_lib.glsl remove lines, write plain text, ..., now rebuild and go in edit mode with the default cube. I also had to remove the entry in gpu/CMakeLists.txt for gpu_shader_material.glsl since this was being tracked directly, as well as running data_to_c_simple (otherwise CMake raises an error for duplicated entries). We probably want to do the same for the other datatoc functions. Reviewers: LazyDodo, brecht Differential Revision: https://developer.blender.org/D3803
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/gpu/CMakeLists.txt22
1 files changed, 0 insertions, 22 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 0fde0e2a4a9..31cf2033714 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -62,28 +62,6 @@ set(SRC
intern/gpu_shader.c
intern/gpu_texture.c
- shaders/gpu_shader_fx_lib.glsl
- shaders/gpu_shader_fx_ssao_frag.glsl
- shaders/gpu_shader_fx_dof_frag.glsl
- shaders/gpu_shader_fx_dof_vert.glsl
- shaders/gpu_shader_fx_dof_hq_frag.glsl
- shaders/gpu_shader_fx_dof_hq_vert.glsl
- shaders/gpu_shader_fx_dof_hq_geo.glsl
- shaders/gpu_shader_fx_vert.glsl
- shaders/gpu_shader_material.glsl
- shaders/gpu_shader_sep_gaussian_blur_frag.glsl
- shaders/gpu_shader_sep_gaussian_blur_vert.glsl
- shaders/gpu_shader_basic_frag.glsl
- shaders/gpu_shader_basic_vert.glsl
- shaders/gpu_shader_basic_geom.glsl
- shaders/gpu_shader_vertex.glsl
- shaders/gpu_shader_vsm_store_frag.glsl
- shaders/gpu_shader_vsm_store_vert.glsl
- shaders/gpu_shader_fx_depth_resolve.glsl
- shaders/gpu_shader_fire_frag.glsl
- shaders/gpu_shader_smoke_frag.glsl
- shaders/gpu_shader_smoke_vert.glsl
-
GPU_basic_shader.h
GPU_buffers.h
GPU_compositing.h