diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2021-09-29 18:58:31 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2021-09-29 18:58:31 +0300 |
| commit | e7c2e1909613fc6d327203b7d3871b4860f027f0 (patch) | |
| tree | aa0b31ae7ea82ea62bc8397f0a4ecd8b6d5bbf06 /source/blender/draw/CMakeLists.txt | |
| parent | f466a0f1dffc855aaa4129dd590ef3ddabce0588 (diff) | |
| parent | e28ae32461c6e3791832a2850f1ad947eb24b55e (diff) | |
Merge branch 'eevee-rewrite' into viewport-compositor
# Conflicts:
# source/blender/blenkernel/BKE_scene.h
# source/blender/blenkernel/intern/scene.c
# source/blender/draw/intern/draw_manager.c
# source/blender/draw/intern/draw_manager.h
# source/blender/nodes/composite/nodes/node_composite_composite.cc
Diffstat (limited to 'source/blender/draw/CMakeLists.txt')
| -rw-r--r-- | source/blender/draw/CMakeLists.txt | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 085a6cda902..1121a747847 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -52,8 +52,8 @@ set(INC set(SRC intern/draw_cache.c intern/draw_cache_extract_mesh.cc - intern/draw_cache_extract_mesh_extractors.c intern/draw_cache_extract_mesh_render_data.c + intern/mesh_extractors/extract_mesh.c intern/mesh_extractors/extract_mesh_ibo_edituv.cc intern/mesh_extractors/extract_mesh_ibo_fdots.cc intern/mesh_extractors/extract_mesh_ibo_lines.cc @@ -91,7 +91,7 @@ set(SRC intern/draw_cache_impl_particles.c intern/draw_cache_impl_pointcloud.c intern/draw_cache_impl_volume.c - intern/draw_color_management.c + intern/draw_color_management.cc intern/draw_common.c intern/draw_debug.c intern/draw_view_data.cc @@ -194,7 +194,6 @@ set(SRC intern/DRW_render.h intern/draw_cache.h intern/draw_cache_extract.h - intern/draw_cache_extract_mesh_private.h intern/draw_cache_impl.h intern/draw_cache_inline.h intern/draw_color_management.h @@ -210,6 +209,7 @@ set(SRC intern/draw_texture_pool.h intern/draw_shader.h intern/draw_view.h + intern/mesh_extractors/extract_mesh.h intern/smaa_textures.h engines/basic/basic_engine.h engines/compositor/compositor_engine.h @@ -460,6 +460,7 @@ data_to_c_simple(engines/overlay/shaders/extra_wire_frag.glsl SRC) data_to_c_simple(engines/overlay/shaders/extra_wire_vert.glsl SRC) data_to_c_simple(engines/overlay/shaders/facing_frag.glsl SRC) data_to_c_simple(engines/overlay/shaders/facing_vert.glsl SRC) +data_to_c_simple(engines/overlay/shaders/grid_background_frag.glsl SRC) data_to_c_simple(engines/overlay/shaders/grid_frag.glsl SRC) data_to_c_simple(engines/overlay/shaders/grid_vert.glsl SRC) data_to_c_simple(engines/overlay/shaders/image_vert.glsl SRC) @@ -496,6 +497,13 @@ data_to_c_simple(engines/image/shaders/engine_image_vert.glsl SRC) list(APPEND INC ) +if(WITH_DRAW_DEBUG) + list(APPEND SRC + engines/select/select_debug_engine.c + ) + add_definitions(-DWITH_DRAW_DEBUG) +endif() + if(WITH_MOD_FLUID) list(APPEND INC ../../../intern/mantaflow/extern |