[Bf-blender-cvs] [11e5d298e7f] temp-greasepencil-vfx: Merge branch 'greasepencil-object' into temp-greasepencil-vfx

[Antonio Vazquez]

Commit: 11e5d298e7f1db159eefb90493bbb12b53ed6db5
Author: Antonio Vazquez
Date:   Wed Jun 27 16:46:23 2018 +0200
Branches: temp-greasepencil-vfx
https://developer.blender.org/rB11e5d298e7f1db159eefb90493bbb12b53ed6db5

Merge branch 'greasepencil-object' into temp-greasepencil-vfx

===================================================================



===================================================================

diff --cc source/blender/draw/engines/gpencil/gpencil_engine.c
index f1d5a291a3c,9f489bf01ba..82939c76217
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@@ -137,20 -129,11 +137,20 @@@ static void GPENCIL_create_framebuffers
  			GPU_ATTACHMENT_TEXTURE(e_data.temp_color_tx_a)
  			});
  
 +		e_data.temp_depth_tx_b = DRW_texture_pool_query_2D(size[0], size[1], GPU_DEPTH24_STENCIL8,
 +			&draw_engine_object_type);
 +		e_data.temp_color_tx_b = DRW_texture_pool_query_2D(size[0], size[1], fb_format,
 +			&draw_engine_object_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);
+ 			&draw_engine_gpencil_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);
  		GPU_framebuffer_ensure_config(&fbl->background_fb, {
  			GPU_ATTACHMENT_TEXTURE(e_data.background_depth_tx),
  			GPU_ATTACHMENT_TEXTURE(e_data.background_color_tx)