Commit: 78f943d1866821a603bd18a626610d857a05bea3
Author: Antonio Vazquez
Date: Fri Jun 29 11:10:21 2018 +0200
Branches: temp-greasepencil-vfx
https://developer.blender.org/rB78f943d1866821a603bd18a626610d857a05bea3
Merge branch 'greasepencil-object' into temp-greasepencil-vfx
===================================================================
===================================================================
diff --cc source/blender/draw/engines/gpencil/gpencil_engine.c
index c95acce64f3,7cf9187ff70..e18e78ffd07
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@@ -124,20 -123,11 +124,20 @@@ static void GPENCIL_create_framebuffers
GPU_ATTACHMENT_TEXTURE(e_data.temp_color_tx_a)
});
- /* background framebuffer to speed up drawing process */
+ e_data.temp_depth_tx_b = DRW_texture_pool_query_2D(size[0],
size[1], GPU_DEPTH24_STENCIL8,
- &draw_engine_object_type);
++ &draw_engine_gpencil_type);
+ e_data.temp_color_tx_b = DRW_texture_pool_query_2D(size[0],
size[1], fb_format,
- &draw_engine_object_type);
++ &draw_engine_gpencil_type);
+ GPU_framebuffer_ensure_config(&fbl->temp_fb_b, {
+ GPU_ATTACHMENT_TEXTURE(e_data.temp_depth_tx_b),
+ GPU_ATTACHMENT_TEXTURE(e_data.temp_color_tx_b)
+ });
+
+ /* 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,
- &draw_engine_object_type);
+ &draw_engine_gpencil_type);
+ e_data.background_color_tx = DRW_texture_pool_query_2D(size[0],
size[1], GPU_RGBA32F,
+ &draw_engine_gpencil_type);
GPU_framebuffer_ensure_config(&fbl->background_fb, {
GPU_ATTACHMENT_TEXTURE(e_data.background_depth_tx),
GPU_ATTACHMENT_TEXTURE(e_data.background_color_tx)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
