Revision: 14334
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14334
Author: campbellbarton
Date: 2008-04-05 12:55:18 +0200 (Sat, 05 Apr 2008)
Log Message:
-----------
fix for wrong rotation between branch joins
Modified Paths:
--------------
trunk/blender/release/scripts/wizard_curve2tree.py
Modified: trunk/blender/release/scripts/wizard_curve2tree.py
===================================================================
--- trunk/blender/release/scripts/wizard_curve2tree.py 2008-04-04 23:12:20 UTC
(rev 14333)
+++ trunk/blender/release/scripts/wizard_curve2tree.py 2008-04-05 10:55:18 UTC
(rev 14334)
@@ -46,6 +46,15 @@
GLOBALS = {}
GLOBALS['non_bez_error'] = 0
+'''
+def debugVec(v1,v2):
+ sce = bpy.data.scenes.active
+ me = bpy.data.meshes.new()
+ me.verts.extend( [v1,v2] )
+ me.edges.extend( [(0,1)] )
+ sce.objects.new(me)
+'''
+
def AngleBetweenVecsSafe(a1, a2):
try:
return AngleBetweenVecs(a1,a2)
@@ -1487,7 +1496,7 @@
else:
# our roll was set from the branches
parent and needs no changing
# set it to zero so the following
functions know to interpolate.
- brch.bpoints[0].roll_angle = 45.0
+ brch.bpoints[0].roll_angle = 0.0
#brch.bpoints[1].roll_angle = 0.0
'''
@@ -2407,6 +2416,7 @@
Roll the quad about its normal
use for aurienting the sides of a quad to meet a branch that
stems from here...
'''
+ # debugVec(self.co, self.co + self.no)
mat = RotationMatrix(angle, 3, 'r', self.no)
for i in xrange(4):
@@ -2451,7 +2461,7 @@
def calcVerts(self):
if self.prev == None:
if self.branch.parent_pt:
- cross = CrossVecs(self.no,
self.branch.getParentFaceCent() - self.branch.parent_pt.getAbsVec(
self.branch.getParentQuadIndex() ))
+ cross = CrossVecs(self.no,
self.branch.parent_pt.no) * RotationMatrix(-45, 3, 'r', self.no)
else:
# parentless branch - for best results get a
cross thats not the same as the normal, in rare cases this happens.
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
