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

[Antonio Vazquez]

Commit: ccde45a4b65d28b9899b10e947c2f55ac1a99df5
Author: Antonio Vazquez
Date:   Thu Jun 28 17:49:39 2018 +0200
Branches: temp-greasepencil-vfx
https://developer.blender.org/rBccde45a4b65d28b9899b10e947c2f55ac1a99df5

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

 Conflicts:
	release/datafiles/userdef/userdef_default_theme.c

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



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

diff --cc source/blender/draw/engines/gpencil/gpencil_engine.c
index d3f0056aa36,9e794eb3104..c95acce64f3
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@@ -658,16 -635,10 +660,16 @@@ void GPENCIL_draw_scene(void *ved
  
  					MULTISAMPLE_GP_SYNC_DISABLE(stl->storage->multisamples, fbl, fbl->temp_fb_a, txl);
  				}
 +
  				/* Current buffer drawing */
- 				if ((!is_render) && (gpd->sbuffer_size > 0)) {
+ 				if ((!is_render) && (gpd->runtime.sbuffer_size > 0)) {
  					DRW_draw_pass(psl->drawing_pass);
  				}
 +				/* fx passes */
 +				if (BKE_shaderfx_has_gpencil(ob)) {
 +					stl->storage->tonemapping = 0;
 +					DRW_gpencil_fx_draw(&e_data, vedata, cache);
 +				}
  
  				e_data.input_depth_tx = e_data.temp_depth_tx_a;
  				e_data.input_color_tx = e_data.temp_color_tx_a;