Merge branch 'master' into asset-browser-poselib

This commit is contained in:
Julian Eisel 2021-06-23 12:12:02 +02:00
commit 7c661bf32d
2 changed files with 6 additions and 9 deletions

View File

@ -23,7 +23,7 @@
bl_info = {
"name": "LoopTools",
"author": "Bart Crouch, Vladimir Spivak (cwolf3d)",
"version": (4, 7, 6),
"version": (4, 7, 7),
"blender": (2, 80, 0),
"location": "View3D > Sidebar > Edit Tab / Edit Mode Context Menu",
"warning": "",
@ -3419,19 +3419,16 @@ class Bridge(Operator):
# create vertices
if vertices:
bridge_create_vertices(bm, vertices)
# delete internal faces
if self.remove_faces and old_selected_faces:
bridge_remove_internal_faces(bm, old_selected_faces)
# create faces
if faces:
new_faces = bridge_create_faces(object, bm, faces, self.twist)
old_selected_faces = [
i for i, face in enumerate(bm.faces) if face.index in old_selected_faces
] # updating list
bridge_select_new_faces(new_faces, smooth)
# edge-data could have changed, can't use cache next run
if faces and not vertices:
cache_delete("Bridge")
# delete internal faces
if self.remove_faces and old_selected_faces:
bridge_remove_internal_faces(bm, old_selected_faces)
# make sure normals are facing outside
bmesh.update_edit_mesh(object.data, loop_triangles=False, destructive=True)
bpy.ops.mesh.normals_make_consistent()

View File

@ -159,8 +159,8 @@ def copy_bone(obj, bone_name, assign_name='', *, parent=False, inherit_scale=Fal
for name in ['bbone_segments',
'bbone_easein', 'bbone_easeout',
'bbone_rollin', 'bbone_rollout',
'bbone_curveinx', 'bbone_curveiny', 'bbone_curveoutx', 'bbone_curveouty',
'bbone_scaleinx', 'bbone_scaleiny', 'bbone_scaleoutx', 'bbone_scaleouty']:
'bbone_curveinx', 'bbone_curveinz', 'bbone_curveoutx', 'bbone_curveoutz',
'bbone_scalein', 'bbone_scaleout']:
setattr(edit_bone_2, name, getattr(edit_bone_1, name))
# Resize the bone after copy if requested