Commit: f23e999720fcf3e4fd7988e3975acdbe24b570fb
Author: Antonio Vazquez
Date: Wed Jun 20 19:12:41 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf23e999720fcf3e4fd7988e3975acdbe24b570fb
Cleanup: Rename shader to keep name consistency
===================================================================
M source/blender/draw/CMakeLists.txt
M source/blender/draw/engines/gpencil/gpencil_engine.c
R100 source/blender/draw/engines/gpencil/shaders/gpencil_painting_frag.glsl
source/blender/draw/engines/gpencil/shaders/gpencil_background_frag.glsl
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt
b/source/blender/draw/CMakeLists.txt
index a5533ec873c..828543637f3 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -308,7 +308,7 @@
data_to_c_simple(engines/gpencil/shaders/gpencil_simple_mix_frag.glsl SRC)
data_to_c_simple(engines/gpencil/shaders/gpencil_point_vert.glsl SRC)
data_to_c_simple(engines/gpencil/shaders/gpencil_point_geom.glsl SRC)
data_to_c_simple(engines/gpencil/shaders/gpencil_point_frag.glsl SRC)
-data_to_c_simple(engines/gpencil/shaders/gpencil_painting_frag.glsl SRC)
+data_to_c_simple(engines/gpencil/shaders/gpencil_background_frag.glsl SRC)
data_to_c_simple(engines/gpencil/shaders/gpencil_paper_frag.glsl SRC)
data_to_c_simple(engines/gpencil/shaders/gpencil_edit_point_vert.glsl SRC)
data_to_c_simple(engines/gpencil/shaders/gpencil_edit_point_geom.glsl SRC)
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c
b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 49c5767ebee..a21359805e2 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -60,7 +60,7 @@ extern char datatoc_gpencil_pixel_frag_glsl[];
extern char datatoc_gpencil_swirl_frag_glsl[];
extern char datatoc_gpencil_flip_frag_glsl[];
extern char datatoc_gpencil_light_frag_glsl[];
-extern char datatoc_gpencil_painting_frag_glsl[];
+extern char datatoc_gpencil_background_frag_glsl[];
extern char datatoc_gpencil_paper_frag_glsl[];
extern char datatoc_gpencil_edit_point_vert_glsl[];
extern char datatoc_gpencil_edit_point_geom_glsl[];
@@ -129,7 +129,7 @@ static void GPENCIL_create_framebuffers(void *vedata)
GPU_ATTACHMENT_TEXTURE(e_data.temp_color_tx_a)
});
- /* painting framebuffer to speed up drawing process (always 16
bits) */
+ /* background framebuffer to speed up drawing process (always
16 bits) */
e_data.background_depth_tx = DRW_texture_pool_query_2D(size[0],
size[1], GPU_DEPTH24_STENCIL8,
&draw_engine_object_type);
e_data.background_color_tx = DRW_texture_pool_query_2D(size[0],
size[1], GPU_RGBA16F,
@@ -195,7 +195,7 @@ static void GPENCIL_create_shaders(void)
/* shaders for use when drawing */
if (!e_data.gpencil_background_sh) {
- e_data.gpencil_background_sh =
DRW_shader_create_fullscreen(datatoc_gpencil_painting_frag_glsl, NULL);
+ e_data.gpencil_background_sh =
DRW_shader_create_fullscreen(datatoc_gpencil_background_frag_glsl, NULL);
}
if (!e_data.gpencil_paper_sh) {
e_data.gpencil_paper_sh =
DRW_shader_create_fullscreen(datatoc_gpencil_paper_frag_glsl, NULL);
diff --git
a/source/blender/draw/engines/gpencil/shaders/gpencil_painting_frag.glsl
b/source/blender/draw/engines/gpencil/shaders/gpencil_background_frag.glsl
similarity index 100%
rename from
source/blender/draw/engines/gpencil/shaders/gpencil_painting_frag.glsl
rename to
source/blender/draw/engines/gpencil/shaders/gpencil_background_frag.glsl
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
