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-01-22 12:48:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2007-01-22 12:48:03 +0300
commit32676b66a4117c84f1f94d0203cbe73a76062e86 (patch)
tree8a03ae69a8e4cb9baa7b3ac5a87b88f5bdce5e16 /release/scripts/uvcalc_smart_project.py
parent22eeaadab734dbb94fbbf5819e7bca34568bc94c (diff)
fixed error on hole filling (http://blender.org/forum/viewtopic.php?p=59062#59062)
Diffstat (limited to 'release/scripts/uvcalc_smart_project.py')
-rw-r--r--release/scripts/uvcalc_smart_project.py24
1 files changed, 6 insertions, 18 deletions
diff --git a/release/scripts/uvcalc_smart_project.py b/release/scripts/uvcalc_smart_project.py
index 5072315576c..c5d16940189 100644
--- a/release/scripts/uvcalc_smart_project.py
+++ b/release/scripts/uvcalc_smart_project.py
@@ -394,6 +394,7 @@ def mergeUvIslands(islandList):
global USER_FILL_HOLES
global USER_FILL_HOLES_QUALITY
+
# Pack islands to bottom LHS
# Sync with island
@@ -462,7 +463,6 @@ def mergeUvIslands(islandList):
BREAK= False
while areaIslandIdx < len(decoratedIslandListAreaSort) and not BREAK:
sourceIsland = decoratedIslandListAreaSort[areaIslandIdx]
-
# Alredy packed?
if not sourceIsland[0]:
areaIslandIdx+=1
@@ -515,17 +515,9 @@ def mergeUvIslands(islandList):
testHeight = targetIsland[5] - sourceIsland[5]
# Increment we move each test. x/y
- #xIncrement = (testWidth / (blockTestXUnit * USER_STEP_QUALITY))
- #yIncrement = (testHeight / (blockTestYUnit * USER_STEP_QUALITY))
- #xIncrement= testWidth/USER_STEP_QUALITY
- #yIncrement= testHeight/USER_STEP_QUALITY
- # USER_STEP_QUALITY is 5.0 when quality is 100 and 1.0 when quality is 1
- xIncrement = (sourceIsland[4] / targetIsland[4]) * ((6 - USER_STEP_QUALITY)*50)
- yIncrement = (sourceIsland[5] / targetIsland[5]) * ((6 - USER_STEP_QUALITY)*50)
-
-
- #~ print xIncrement, yIncrement, USER_STEP_QUALITY
-
+ xIncrement = (testWidth / (blockTestXUnit * ((USER_STEP_QUALITY/50)+0.1)))
+ yIncrement = (testHeight / (blockTestYUnit * ((USER_STEP_QUALITY/50)+0.1)))
+
# Make sure were not moving less then a 3rg of our width/height
if xIncrement<sourceIsland[4]/3:
xIncrement= sourceIsland[4]
@@ -613,7 +605,6 @@ def mergeUvIslands(islandList):
break
-
# INCREMENR NEXT LOCATION
if boxLeft > testWidth:
boxBottom += yIncrement
@@ -1054,12 +1045,9 @@ def main():
else:
if len(projectVecs) >= 1: # Must have at least 2 projections
- print len(projectVecs)
break
-
-
-
-
+
+
# If there are only zero area faces then its possible
# there are no projectionVecs
if not len(projectVecs):