[Bf-blender-cvs] [4e50a1eb3ae] greasepencil-object: Cleanup: Change calculation using only matrix

Antonio Vazquez noreply at git.blender.org
Fri Jul 21 20:57:49 CEST 2017


Commit: 4e50a1eb3ae4e96fae4248ed5b7c9c5c1b764306
Author: Antonio Vazquez
Date:   Fri Jul 21 20:40:39 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB4e50a1eb3ae4e96fae4248ed5b7c9c5c1b764306

Cleanup: Change calculation using only matrix

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

M	source/blender/blenkernel/intern/gpencil.c

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 6fe7b74e20e..33d76ce47a3 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1910,11 +1910,11 @@ void ED_gpencil_array_modifier(int id, GpencilArrayModifierData *mmd, bGPDlayer
 	bGPDspoint *pt;
 	bGPDstroke *gps_dst;
 	struct tGPencilStrokeCache *stroke_cache, *p = NULL;
-	float offset[3], zerov3[3], rot[3], scale[3];
+	float offset[3], rot[3], scale[3];
 	float mat[4][4];
 	float factor;
 	int ri;
-	zero_v3(zerov3);
+
 	/* create cache for sorting */
 	int totstrokes = BLI_listbase_count(&gpf->strokes);
 	int cachesize =  totstrokes * mmd->count;
@@ -1974,13 +1974,12 @@ void ED_gpencil_array_modifier(int id, GpencilArrayModifierData *mmd, bGPDlayer
 				mmd->rnd[0] = 1;
 			}
 
-			loc_eul_size_to_mat4(mat, zerov3, rot, scale);
+			loc_eul_size_to_mat4(mat, offset, rot, scale);
 
 			/* move points */
 			for (int i = 0; i < gps->totpoints; ++i) {
 				pt = &gps_dst->points[i];
 				mul_m4_v3(mat, &pt->x);
-				add_v3_v3(&pt->x, offset);
 			}
 			++idx;
 		}




More information about the Bf-blender-cvs mailing list