diff options
| author | Peter Kim <pk15950@gmail.com> | 2022-02-27 12:57:23 +0300 |
|---|---|---|
| committer | Peter Kim <pk15950@gmail.com> | 2022-02-27 12:57:23 +0300 |
| commit | 604ae8d2bd658188148e67a667c67a738e22b34d (patch) | |
| tree | 40daa1513e4461ae38e7daf9d4cc38e0b161ff99 | |
| parent | a481fe51927258b391eb37f1847ab8ef4a175d3c (diff) | |
| parent | cbfbb76b353bc2b3bf3517be5034423a40220d75 (diff) | |
Merge branch 'master' into xr-dev
| -rw-r--r-- | io_scene_fbx/__init__.py | 2 | ||||
| -rw-r--r-- | io_scene_fbx/import_fbx.py | 5 | ||||
| -rw-r--r-- | precision_drawing_tools/__init__.py | 4 | ||||
| -rw-r--r-- | precision_drawing_tools/pdt_command.py | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index 6f9dacb9..cf7b75a8 100644 --- a/io_scene_fbx/__init__.py +++ b/io_scene_fbx/__init__.py @@ -5,7 +5,7 @@ bl_info = { "name": "FBX format", "author": "Campbell Barton, Bastien Montagne, Jens Restemeier", - "version": (4, 33, 0), + "version": (4, 33, 1), "blender": (3, 2, 0), "location": "File > Import-Export", "description": "FBX IO meshes, UV's, vertex colors, materials, textures, cameras, lamps and actions", diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py index 78b315b2..7efd3ab1 100644 --- a/io_scene_fbx/import_fbx.py +++ b/io_scene_fbx/import_fbx.py @@ -752,7 +752,10 @@ def blen_read_animations(fbx_tmpl_astack, fbx_tmpl_alayer, stacks, scene, anim_o key = (as_uuid, al_uuid, id_data) action = actions.get(key) if action is None: - action_name = "|".join((id_data.name, stack_name, layer_name)) + if stack_name == layer_name: + action_name = "|".join((id_data.name, stack_name)) + else: + action_name = "|".join((id_data.name, stack_name, layer_name)) actions[key] = action = bpy.data.actions.new(action_name) action.use_fake_user = True # If none yet assigned, assign this action to id_data. diff --git a/precision_drawing_tools/__init__.py b/precision_drawing_tools/__init__.py index cc041b7a..9d3ae175 100644 --- a/precision_drawing_tools/__init__.py +++ b/precision_drawing_tools/__init__.py @@ -13,8 +13,8 @@ bl_info = { "name": "Precision Drawing Tools (PDT)", "author": "Alan Odom (Clockmender), Rune Morling (ermo)", - "version": (1, 5, 1), - "blender": (2, 90, 0), + "version": (1, 5, 2), + "blender": (3, 0, 0), "location": "View3D > UI > PDT", "description": "Precision Drawing Tools for Accurate Modelling", "warning": "", diff --git a/precision_drawing_tools/pdt_command.py b/precision_drawing_tools/pdt_command.py index 6e06e4a7..a5452a9a 100644 --- a/precision_drawing_tools/pdt_command.py +++ b/precision_drawing_tools/pdt_command.py @@ -1043,7 +1043,8 @@ def fillet_geometry(context, pg, mode, obj, bm, verts, values): # Note that passing an empty parameter results in that parameter being seen as "0" # _offset <= 0 is ignored since a bevel/fillet radius must be > 0 to make sense _offset = float(values[0]) - _segments = float(values[1]) + # Force _segments to an integer (bug fix T95442) + _segments = int(float(values[1])) if _segments < 1: _segments = 1 # This is a single, flat segment (ignores profile) _profile = float(values[2]) |