[Bf-blender-cvs] [8ea91b34d7f] greasepencil-object: GPencil: Back Canvas Grid to Draw position

[Antonioya]

Commit: 8ea91b34d7fa6c5fffc955bdac9eb368cf45756f
Author: Antonioya
Date:   Sat Mar 16 19:33:18 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB8ea91b34d7fa6c5fffc955bdac9eb368cf45756f

GPencil: Back Canvas Grid to Draw position

Undo the previous commit and keep the Canvas in the position used in Draw mode. Change the position by mode looks strange.

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

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 f3ed7fb2594..7fbae5e98ea 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -662,24 +662,12 @@ void GPENCIL_cache_populate(void *vedata, Object *ob)
 				}
 			}
 
-			/* Move the origin to Object or Cursor
-			 * In Draw mode the origin is defined by origin
-			 * In other modes, the origin is defined by drawing plane */
-			if (ob->mode == OB_MODE_PAINT_GPENCIL) {
-				if (ts->gpencil_v3d_align & GP_PROJECT_CURSOR) {
-					copy_v3_v3(stl->storage->grid_matrix[3], cursor->location);
-				}
-				else {
-					copy_v3_v3(stl->storage->grid_matrix[3], ob->obmat[3]);
-				}
+			/* Move the origin to Object or Cursor */
+			if (ts->gpencil_v3d_align & GP_PROJECT_CURSOR) {
+				copy_v3_v3(stl->storage->grid_matrix[3], cursor->location);
 			}
 			else {
-				if (ts->gp_sculpt.lock_axis == GP_LOCKAXIS_CURSOR) {
-					copy_v3_v3(stl->storage->grid_matrix[3], cursor->location);
-				}
-				else {
-					copy_v3_v3(stl->storage->grid_matrix[3], ob->obmat[3]);
-				}
+				copy_v3_v3(stl->storage->grid_matrix[3], ob->obmat[3]);
 			}
 
 			DRW_shgroup_call_add(