sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BPyImage had a problem with a path being returned as None

Browse Source 
BPyMesh would make NAN coords for collapsed edges.
This commit is contained in:
Campbell Barton 2006-05-15 13:33:30 +00:00
parent 996b594d01
commit 51eb744807
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release/scripts/bpymodules/BPyImage.py
View File

@ -71,7 +71,10 @@ def getExt(name):
# Adds a slash to the end of a path if its not there #
#====================================================#
def addSlash(path):
if path.endswith('\\') or path.endswith('/'):
if not path:
return ''
elif path.endswith('\\') or path.endswith('/'):
return path
return path + sys.sep

6
release/scripts/bpymodules/BPyMesh_redux.py
View File

@ -136,6 +136,7 @@ def redux(ob, REDUX=0.5, BOUNDRY_WEIGHT=2.0, FACE_AREA_WEIGHT=1.0, FACE_TRIANGUL
v1no= ced.v1.co
v2no= ced.v2.co
length= ced.length
between= (v1co + v2co) * 0.5
# Collapse
# new_location = between # Replace tricky code below. this code predicts the best collapse location.
@ -152,7 +153,10 @@ def redux(ob, REDUX=0.5, BOUNDRY_WEIGHT=2.0, FACE_AREA_WEIGHT=1.0, FACE_TRIANGUL
cv1 = cv1 * length* 0.333
cv2 = cv2 * length* 0.333
ced.collapse_loc = ((v1co + v2co) * 0.5) + (cv1 + cv2)
ced.collapse_loc = between + (cv1 + cv2)
if ced.collapse_loc.x != ced.collapse_loc.x: # NAN LOCATION, revert to between
ced.collapse_loc= between
# Best method, no quick hacks here, Correction. Should be the best but needs tweaks.