diff options
Diffstat (limited to 'release/scripts')
| m--------- | release/scripts/addons | 0 | ||||
| -rw-r--r-- | release/scripts/modules/bpy/ops.py | 5 | ||||
| -rw-r--r-- | release/scripts/startup/bl_operators/uvcalc_smart_project.py | 10 |
3 files changed, 9 insertions, 6 deletions
diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 8ad356e3324cddef42d41f9b9b588ef1ebd2f8b +Subproject 6c32300be8cc8d48a3e02055dc43bea2ab98a52 diff --git a/release/scripts/modules/bpy/ops.py b/release/scripts/modules/bpy/ops.py index 1d71bffbd84..e457c087ab8 100644 --- a/release/scripts/modules/bpy/ops.py +++ b/release/scripts/modules/bpy/ops.py @@ -204,7 +204,10 @@ class BPyOpsSubModOp(object): import bpy idname = self.idname() as_string = op_as_string(idname) - op_class = getattr(bpy.types, idname) + # XXX You never quite know what you get from bpy.types, with operators... Operator and OperatorProperties + # are shadowing each other, and not in the same way for native ops and py ones! See T39158. + # op_class = getattr(bpy.types, idname) + op_class = op_get_rna(idname) descr = op_class.bl_rna.description # XXX, workaround for not registering # every __doc__ to save time on load. diff --git a/release/scripts/startup/bl_operators/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py index 74fb9e98c82..70df5a9df21 100644 --- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py +++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py @@ -23,7 +23,7 @@ import bpy from bpy.types import Operator DEG_TO_RAD = 0.017453292519943295 # pi/180.0 -SMALL_NUM = 0.000001 # see bug [#31598] why we dont have smaller values +SMALL_NUM = 0.00000001 # see bug [#31598] why we dont have smaller values global USER_FILL_HOLES global USER_FILL_HOLES_QUALITY @@ -594,10 +594,10 @@ def packIslands(islandList): # recalc width and height w, h = maxx-minx, maxy-miny - if w < 0.00001 or h < 0.00001: - del islandList[islandIdx] - islandIdx -=1 - continue + if w < SMALL_NUM: + w = SMALL_NUM + if h < SMALL_NUM: + h = SMALL_NUM """Save the offset to be applied later, we could apply to the UVs now and allign them to the bottom left hand area |