[Bf-blender-cvs] [a596d5df05d] greasepencil-object: Fix error in OpenGL render

[Antonio Vazquez]

Commit: a596d5df05df19956d0be037920ef4c85df7e55a
Author: Antonio Vazquez
Date:   Sat Feb 10 20:04:24 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa596d5df05df19956d0be037920ef4c85df7e55a

Fix error in OpenGL render

As F12 and OpenGL are detected as render mode, the pixel size was not correct.

I have added a check to verify if it is a real F12 render or it's a OpenGL.

Maybe this check must be removed if the OpenGL render operator is deprecated by a new system, but we need to keep the verification until them.

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

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

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index e0754aea5be..1dba6a75674 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -296,10 +296,9 @@ static void GPENCIL_cache_init(void *vedata)
 		stl->storage->is_render = DRW_state_is_image_render();
 
 		/* save pixsize */
-		if (!stl->storage->is_render) {
-			stl->storage->pixsize = DRW_viewport_pixelsize_get();
-		}
-		else {
+		stl->storage->pixsize = DRW_viewport_pixelsize_get();
+		/* TODO: Remove OpenGL render check if this operator is replaced by new system */
+		if (((G.f & G_RENDER_OGL) == 0) && (stl->storage->is_render)) {
 			stl->storage->pixsize = &stl->storage->render_pixsize;
 		}