[Bf-blender-cvs] [1c04f26efdf] greasepencil-object: Fix missing parameter after merge

Antonioya noreply at git.blender.org
Mon Jul 30 14:39:32 CEST 2018


Commit: 1c04f26efdf798b3c9005a77f04254c7a36493d3
Author: Antonioya
Date:   Mon Jul 30 14:39:23 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1c04f26efdf798b3c9005a77f04254c7a36493d3

Fix missing parameter after merge

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

M	source/blender/draw/engines/gpencil/gpencil_engine.h

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 59630b5f304..24a627f1012 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -347,7 +347,7 @@ void GPENCIL_render_to_image(void *vedata, struct RenderEngine *engine, struct R
 	if ((lvl > 0) && (fbl->multisample_fb != NULL)) { \
 		DRW_stats_query_start("GP Multisample Resolve"); \
 		GPU_framebuffer_bind(fb); \
-		DRW_multisamples_resolve(txl->multisample_depth, txl->multisample_color); \
+		DRW_multisamples_resolve(txl->multisample_depth, txl->multisample_color, true); \
 		DRW_stats_query_end(); \
 	} \
 }



More information about the Bf-blender-cvs mailing list