Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-07-25 12:48:58 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-07-25 12:48:58 +0400
commit48c9da843c40ff8a97b462d8539185b662ba1567 (patch)
tree5ef66e3398e8a8b852e405cd29ba26ce3f617404 /space_view3d_panel_measure.py
parent7690c2a38db02317d7ad289a16b8c55b5ec0ed3a (diff)
swap vector multiplication order, also some style changes
Diffstat (limited to 'space_view3d_panel_measure.py')
-rw-r--r--space_view3d_panel_measure.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/space_view3d_panel_measure.py b/space_view3d_panel_measure.py
index 6bf8d6ba..69a449a9 100644
--- a/space_view3d_panel_measure.py
+++ b/space_view3d_panel_measure.py
@@ -269,7 +269,7 @@ def getMeasurePoints(context):
return (p1, p2, COLOR_LOCAL)
else:
- p1 = vert_loc * obj.matrix_world
+ p1 = obj.matrix_world * vert_loc
p2 = cur_loc
return (p1, p2, COLOR_GLOBAL)
@@ -288,8 +288,8 @@ def getMeasurePoints(context):
return (p1, p2, COLOR_LOCAL)
else:
- p1 = vert1_loc * obj.matrix_world
- p2 = vert2_loc * obj.matrix_world
+ p1 = obj.matrix_world * vert1_loc
+ p2 = obj.matrix_world * vert2_loc
return (p1, p2, COLOR_GLOBAL)
else:
@@ -350,10 +350,10 @@ def faceAreaGlobal(face, obj):
v4 = obj.data.vertices[v4]
# Apply transform matrix to vertex coordinates.
- v1 = v1.co * mat
- v2 = v2.co * mat
- v3 = v3.co * mat
- v4 = v4.co * mat
+ v1 = mat * v1.co
+ v2 = mat * v2.co
+ v3 = mat * v3.co
+ v4 = mat * v4.co
vec1 = v2 - v1
vec2 = v4 - v1
@@ -381,9 +381,9 @@ def faceAreaGlobal(face, obj):
v3 = obj.data.vertices[v3]
# Apply transform matrix to vertex coordinates.
- v1 = v1.co * mat
- v2 = v2.co * mat
- v3 = v3.co * mat
+ v1 = mat * v1.co
+ v2 = mat * v2.co
+ v3 = mat * v3.co
vec1 = v3 - v2
vec2 = v1 - v2