[Bf-blender-cvs] [4ae2d8daf97] soc-2017-normal-tools: Changed rotation calculation in rotate_normal

Rohan Rathi noreply at git.blender.org
Thu Apr 5 09:02:10 CEST 2018


Commit: 4ae2d8daf978994d82bfa19606735addb73a6e8f
Author: Rohan Rathi
Date:   Thu Apr 5 12:31:46 2018 +0530
Branches: soc-2017-normal-tools
https://developer.blender.org/rB4ae2d8daf978994d82bfa19606735addb73a6e8f

Changed rotation calculation in rotate_normal

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/bmesh/bmesh_class.h
M	source/blender/editors/transform/transform.c
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index d3349b42856..59495b4b590 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit d3349b42856d00c278f72f2a5909a6c96b9cdb5e
+Subproject commit 59495b4b59077aa1cc68fffbdae1463af980f08e
diff --git a/release/scripts/addons b/release/scripts/addons
index 827c5e62e8f..27970761a18 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 827c5e62e8f121f8f946f1f5f514f7751b1d684a
+Subproject commit 27970761a18926abe1b0020aa350305e3109a537
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 310578043de..6a4f93c9b8f 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 310578043dec1aae382eb6a447ae1d103792d7e6
+Subproject commit 6a4f93c9b8f36b19bd02087abf3d7f5983df035a
diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h
index 155e51acbf5..8159aae1ab8 100644
--- a/source/blender/bmesh/bmesh_class.h
+++ b/source/blender/bmesh/bmesh_class.h
@@ -271,8 +271,6 @@ enum {
 typedef struct BMLoopNorEditData {
 	int loop_index;
 	BMLoop *loop;
-	float mtx[3][3];
-	float smtx[3][3];
 	float niloc[3];
 	float nloc[3];
 	float *loc;
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 68ab54ad2a1..7708d1abe2e 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -4223,18 +4223,8 @@ static void applyTrackball(TransInfo *t, const int UNUSED(mval[2]))
 
 static void storeCustomLNorValue(TransInfo *t, BMesh *bm)
 {
-	float mtx[3][3], smtx[3][3];
-
 	BMLoopNorEditDataArray *lnors_ed_arr = BM_loop_normal_editdata_array_init(bm);
-
-	copy_m3_m4(mtx, t->obedit->obmat);
-	pseudoinverse_m3_m3(smtx, mtx, PSEUDOINVERSE_EPSILON);
-
 	BMLoopNorEditData *lnor_ed = lnors_ed_arr->lnor_editdata;
-	for (int i = 0; i < lnors_ed_arr->totloop; i++, lnor_ed++) {
-		copy_m3_m3(lnor_ed->mtx, mtx);
-		copy_m3_m3(lnor_ed->smtx, smtx);
-	}
 
 	t->custom.mode.data = lnors_ed_arr;
 	t->custom.mode.free_cb = freeCustomNormalArray;
@@ -4327,20 +4317,7 @@ static void applyNormalRotation(TransInfo *t, const int UNUSED(mval[2]))
 	axis_angle_normalized_to_mat3(mat, axis, angle);
 
 	for (int i = 0; i < lnors_ed_arr->totloop; i++, lnor_ed++) {
-		float center[3];
-		float vec[3], totmat[3][3], smat[3][3];
-		zero_v3(center);
-
-		mul_m3_m3m3(totmat, mat, lnor_ed->mtx);
-		mul_m3_m3m3(smat, lnor_ed->smtx, totmat);
-
-		sub_v3_v3v3(vec, lnor_ed->niloc, center);
-		mul_m3_v3(smat, vec);
-
-		add_v3_v3v3(lnor_ed->nloc, vec, center);
-
-		sub_v3_v3v3(vec, lnor_ed->nloc, lnor_ed->niloc);
-		add_v3_v3v3(lnor_ed->nloc, lnor_ed->niloc, vec);
+        mul_v3_m3v3(lnor_ed->nloc, mat, lnor_ed->niloc);
 
 		BKE_lnor_space_custom_normal_to_data(
 		            bm->lnor_spacearr->lspacearr[lnor_ed->loop_index], lnor_ed->nloc, lnor_ed->clnors_data);
diff --git a/source/tools b/source/tools
index 7695e14cfc5..88a1758d2d2 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 7695e14cfc5820ac66546e0e515914d85ab81af3
+Subproject commit 88a1758d2d2e862cc69c08b5b40a4e75f71592d3



More information about the Bf-blender-cvs mailing list