Commit: 211ac7b94bf91ce3a4c5f7d4fe1a266007cbe81f Author: Soumya Pochirau Date: Wed Feb 9 16:11:34 2022 +0530 Branches: soc-2021-simulation-display https://developer.blender.org/rB211ac7b94bf91ce3a4c5f7d4fe1a266007cbe81f
merge conflict helper removed =================================================================== M source/blender/draw/CMakeLists.txt =================================================================== diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index fd7b7391df3..439eb88afb9 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -506,7 +506,7 @@ data_to_c_simple(engines/overlay/shaders/xray_fade_frag.glsl SRC) data_to_c_simple(engines/image/shaders/engine_image_frag.glsl SRC) data_to_c_simple(engines/image/shaders/engine_image_vert.glsl SRC) -======= + set(GLSL_SRC engines/eevee/shaders/ambient_occlusion_lib.glsl engines/eevee/shaders/background_vert.glsl _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
