[Bf-blender-cvs] [b3ec99f176d] greasepencil-object: Revert "Fix wrong engine name"
Antonio Vazquez
noreply at git.blender.org
Wed Jun 27 22:44:30 CEST 2018
Commit: b3ec99f176d6c56e29c50f70fb9b23d7e9fec167
Author: Antonio Vazquez
Date: Wed Jun 27 16:44:23 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb3ec99f176d6c56e29c50f70fb9b23d7e9fec167
Revert "Fix wrong engine name"
This reverts commit 7c3c2561705afb2c7eae905df727f9861248737b.
===================================================================
M source/blender/draw/engines/gpencil/gpencil_engine.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 9f489bf01ba..6639e730a60 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -121,9 +121,9 @@ static void GPENCIL_create_framebuffers(void *vedata)
/* temp textures */
e_data.temp_depth_tx_a = DRW_texture_pool_query_2D(size[0], size[1], GPU_DEPTH24_STENCIL8,
- &draw_engine_gpencil_type);
+ &draw_engine_object_type);
e_data.temp_color_tx_a = DRW_texture_pool_query_2D(size[0], size[1], fb_format,
- &draw_engine_gpencil_type);
+ &draw_engine_object_type);
GPU_framebuffer_ensure_config(&fbl->temp_fb_a, {
GPU_ATTACHMENT_TEXTURE(e_data.temp_depth_tx_a),
GPU_ATTACHMENT_TEXTURE(e_data.temp_color_tx_a)
@@ -131,9 +131,9 @@ static void GPENCIL_create_framebuffers(void *vedata)
/* 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_gpencil_type);
+ &draw_engine_object_type);
e_data.background_color_tx = DRW_texture_pool_query_2D(size[0], size[1], GPU_RGBA16F,
- &draw_engine_gpencil_type);
+ &draw_engine_object_type);
GPU_framebuffer_ensure_config(&fbl->background_fb, {
GPU_ATTACHMENT_TEXTURE(e_data.background_depth_tx),
GPU_ATTACHMENT_TEXTURE(e_data.background_color_tx)
More information about the Bf-blender-cvs
mailing list