diff options
| author | YimingWu <xp8110@outlook.com> | 2020-06-04 13:57:28 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-06-04 13:57:28 +0300 |
| commit | bfbf0bb7f7a0191b65fc724d5dfea225e6293c6b (patch) | |
| tree | 042f37d28c9e1cf0ce5a0fb4fd4235288f62d36e /source/blender/draw/CMakeLists.txt | |
| parent | 3b52dfe549f0c2fca7e0cd499b85fb098e9b4da9 (diff) | |
| parent | 78017916f7c7a8ec8907c9b993214ff8ec3c3557 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-reviewtemp-lanpr-review
# Conflicts:
# release/datafiles/locale
# release/scripts/addons
Diffstat (limited to 'source/blender/draw/CMakeLists.txt')
| -rw-r--r-- | source/blender/draw/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index d9f7a3acae0..aeecb452217 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -34,6 +34,7 @@ set(INC ../imbuf ../makesdna ../makesrna + ../nodes ../render/extern/include ../render/intern/include ../windowmanager @@ -317,8 +318,8 @@ data_to_c_simple(engines/select/shaders/selection_id_3D_vert.glsl SRC) data_to_c_simple(engines/select/shaders/selection_id_frag.glsl SRC) data_to_c_simple(engines/basic/shaders/conservative_depth_geom.glsl SRC) -data_to_c_simple(engines/basic/shaders/conservative_depth_vert.glsl SRC) -data_to_c_simple(engines/basic/shaders/conservative_depth_frag.glsl SRC) +data_to_c_simple(engines/basic/shaders/depth_vert.glsl SRC) +data_to_c_simple(engines/basic/shaders/depth_frag.glsl SRC) if(WITH_LANPR) data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl SRC) |