[Bf-blender-cvs] [e93a1db8ec9] greasepencil-object: GPU replace missing in previous commit

Antonio Vazquez noreply at git.blender.org
Wed Jul 11 10:03:35 CEST 2018


Commit: e93a1db8ec9616d0cd268e2069acdfda0639dce3
Author: Antonio Vazquez
Date:   Wed Jul 11 10:03:28 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBe93a1db8ec9616d0cd268e2069acdfda0639dce3

GPU replace missing in previous commit

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

M	source/blender/editors/gpencil/annotate_paint.c

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

diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c
index 1811a1a5bfd..930b7c089a4 100644
--- a/source/blender/editors/gpencil/annotate_paint.c
+++ b/source/blender/editors/gpencil/annotate_paint.c
@@ -1494,7 +1494,7 @@ static void gpencil_draw_eraser(bContext *UNUSED(C), int x, int y, void *p_ptr)
 		immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
 
 		float viewport_size[4];
-		glGetFloatv(GL_VIEWPORT, viewport_size);
+		GPU_viewport_size_get_f(viewport_size);
 		immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
 
 		immUniformColor4f(1.0f, 0.39f, 0.39f, 0.78f);



More information about the Bf-blender-cvs mailing list