1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reverse vector multiplication order for some internal functions.

Browse Source
This commit is contained in:
Campbell Barton 2011-07-25 03:59:01 +00:00
parent ced8f1dffc
commit 7f60ee6cb5
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release/scripts/modules/bpy_extras/view3d_utils.py
View File

@ -50,11 +50,11 @@ def region_2d_to_vector_3d(region, rv3d, coord):
-0.5 -0.5
)) ))
w = (out[0] * persinv[0][3]) + \ w = ((out[0] * persinv[0][3]) +
(out[1] * persinv[1][3]) + \ (out[1] * persinv[1][3]) +
(out[2] * persinv[2][3]) + persinv[3][3] (out[2] * persinv[2][3]) + persinv[3][3])
return ((out * persinv) / w) - rv3d.view_matrix.inverted()[3].xyz return ((persinv * out) / w) - rv3d.view_matrix.inverted()[3].xyz
else: else:
return rv3d.view_matrix.inverted()[2].xyz.normalized() return rv3d.view_matrix.inverted()[2].xyz.normalized()
@ -116,7 +116,7 @@ def location_3d_to_region_2d(region, rv3d, coord):
""" """
from mathutils import Vector from mathutils import Vector
prj = Vector((coord[0], coord[1], coord[2], 1.0)) * rv3d.perspective_matrix prj = rv3d.perspective_matrix * Vector((coord[0], coord[1], coord[2], 1.0))
if prj.w > 0.0: if prj.w > 0.0:
width_half = region.width / 2.0 width_half = region.width / 2.0
height_half = region.height / 2.0 height_half = region.height / 2.0

14
release/scripts/modules/bpy_types.py
View File

@ -144,21 +144,21 @@ class _GenericBone:
""" Vector pointing down the x-axis of the bone. """ Vector pointing down the x-axis of the bone.
""" """
from mathutils import Vector from mathutils import Vector
return Vector((1.0, 0.0, 0.0)) * self.matrix.to_3x3() return self.matrix.to_3x3() * Vector((1.0, 0.0, 0.0))
@property @property
def y_axis(self): def y_axis(self):
""" Vector pointing down the x-axis of the bone. """ Vector pointing down the x-axis of the bone.
""" """
from mathutils import Vector from mathutils import Vector
return Vector((0.0, 1.0, 0.0)) * self.matrix.to_3x3() return self.matrix.to_3x3() * Vector((0.0, 1.0, 0.0))
@property @property
def z_axis(self): def z_axis(self):
""" Vector pointing down the x-axis of the bone. """ Vector pointing down the x-axis of the bone.
""" """
from mathutils import Vector from mathutils import Vector
return Vector((0.0, 0.0, 1.0)) * self.matrix.to_3x3() return self.matrix.to_3x3() * Vector((0.0, 0.0, 1.0))
@property @property
def basename(self): def basename(self):
@ -294,9 +294,9 @@ class EditBone(StructRNA, _GenericBone, metaclass=StructMetaPropGroup):
:type roll: bool :type roll: bool
""" """
from mathutils import Vector from mathutils import Vector
z_vec = Vector((0.0, 0.0, 1.0)) * self.matrix.to_3x3() z_vec = self.matrix.to_3x3() * Vector((0.0, 0.0, 1.0))
self.tail = self.tail * matrix self.tail = matrix * self.tail
self.head = self.head * matrix self.head = matrix * self.head
if scale: if scale:
scalar = matrix.median_scale scalar = matrix.median_scale
@ -304,7 +304,7 @@ class EditBone(StructRNA, _GenericBone, metaclass=StructMetaPropGroup):
self.tail_radius *= scalar self.tail_radius *= scalar
if roll: if roll:
self.align_roll(z_vec * matrix) self.align_roll(matrix * z_vec)
def ord_ind(i1, i2): def ord_ind(i1, i2):