[Bf-blender-cvs] [2cc269fe8fc] greasepencil-object: GP: Fix merge error

Antonioya noreply at git.blender.org
Thu Dec 20 14:00:43 CET 2018


Commit: 2cc269fe8fceaa0ab6a816407a6df48efaec8e54
Author: Antonioya
Date:   Thu Dec 20 14:00:28 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB2cc269fe8fceaa0ab6a816407a6df48efaec8e54

GP: Fix merge error

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

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

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

diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index 8cfcfe26355..5dbd3312780 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -910,18 +910,8 @@ static void gp_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi)
 				add_v2_fl(&p2d->x, -fac);
 			}
 			else {
-				zero_v2(mvec);
+				add_v2_fl(&p2d->x, fac);
 			}
-			svec[0] = -mvec[1];
-			svec[1] = mvec[0];
-
-			if (p2d->rnd[0] > 0.5f) {
-				mul_v2_fl(svec, -fac);
-			}
-			else {
-				mul_v2_fl(svec, fac);
-			}
-			add_v2_v2(&p2d->x, svec);
 		}
 
 		/* apply randomness to pressure */



More information about the Bf-blender-cvs mailing list