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

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2007-12-02 01:00:09 +0300
committerCampbell Barton <ideasman42@gmail.com>2007-12-02 01:00:09 +0300
commit141e279d708c80b5187898035d0d50181cbb6dca (patch)
treedace692b56b7e873ee81a5fc48b272544943cf88 /release
parent44bc6ccf17d63b7484b6e15863960857fa6351bb (diff)
wizard_curve2tree.py - bounding twig mesh didnt work if it had some transformation.
buttons_shading.c - premul button was overlapping movie buttons
Diffstat (limited to 'release')
-rw-r--r--release/scripts/wizard_curve2tree.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/release/scripts/wizard_curve2tree.py b/release/scripts/wizard_curve2tree.py
index b600d4284cf..312c5336411 100644
--- a/release/scripts/wizard_curve2tree.py
+++ b/release/scripts/wizard_curve2tree.py
@@ -170,6 +170,7 @@ class tree:
self.objectTwigBounds = None # use for twigs only at the moment.
self.objectTwigBoundsIMat = None
+ self.objectTwigBoundsMat = None
self.objectTwigBoundsMesh = None
self.objectLeafBounds = None
@@ -276,7 +277,8 @@ class tree:
def setTwigBounds(self, objectMesh):
self.objectTwigBounds = objectMesh
self.objectTwigBoundsMesh = objectMesh.getData(mesh=1)
- self.objectTwigBoundsIMat = objectMesh.matrixWorld.copy().invert()
+ self.objectTwigBoundsMat = objectMesh.matrixWorld.copy()
+ self.objectTwigBoundsIMat = self.objectTwigBoundsMat.copy().invert()
for brch in self.branches_all:
brch.calcTwigBounds(self)
@@ -1006,7 +1008,11 @@ class tree:
vert_segment_mapping[i] = len(segments_all)
v.sel = True
seg = segment(0)
- seg.tailCo = v.co.copy() # headCo undefined atm.
+ # seg.tailCo = v.co.copy() # headCo undefined atm.
+ seg.tailCo = v.co.copy() * self_tree.objectTwigBoundsMat * self_tree.objectCurveIMat
+
+ # self_tree.objectCurveMat
+
seg.no = v.no
# Build connectivity