From f877f705c6d41ec0c2b2caa775fb755589035643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Mon, 7 Oct 2024 16:19:55 +0200 Subject: [PATCH] Revert "DRW: Rename draw_debug_info.hh to avoid conflict with main branch" This reverts commit 301c853b9c30375c464cfa570b53607ea76df5ee. --- source/blender/draw/CMakeLists.txt | 1 + .../shaders/{draw_debug_create_info.hh => draw_debug_info.hh} | 0 source/blender/gpu/CMakeLists.txt | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename source/blender/draw/intern/shaders/{draw_debug_create_info.hh => draw_debug_info.hh} (100%) diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index bbe6e1097bc..bf2dd4a2411 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -605,6 +605,7 @@ set(GLSL_SRC intern/shaders/draw_command_generate_comp.glsl intern/shaders/draw_debug_draw_display_frag.glsl intern/shaders/draw_debug_draw_display_vert.glsl + intern/shaders/draw_debug_info.hh intern/shaders/draw_debug_print_display_frag.glsl intern/shaders/draw_debug_print_display_vert.glsl intern/shaders/draw_intersect_lib.glsl diff --git a/source/blender/draw/intern/shaders/draw_debug_create_info.hh b/source/blender/draw/intern/shaders/draw_debug_info.hh similarity index 100% rename from source/blender/draw/intern/shaders/draw_debug_create_info.hh rename to source/blender/draw/intern/shaders/draw_debug_info.hh diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 7cd98755c63..d02b362bdac 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -782,7 +782,7 @@ set(SRC_SHADER_CREATE_INFOS ../draw/engines/workbench/shaders/infos/workbench_volume_info.hh ../draw/engines/image/shaders/infos/engine_image_info.hh - ../draw/intern/shaders/draw_debug_create_info.hh + ../draw/intern/shaders/draw_debug_info.hh ../draw/intern/shaders/draw_fullscreen_info.hh ../draw/intern/shaders/draw_hair_refine_info.hh ../draw/intern/shaders/draw_object_infos_info.hh