This commit implements described in the #104573. The goal is to fix the confusion of the submodule hashes change, which are not ideal for any of the supported git-module configuration (they are either always visible causing confusion, or silently staged and committed, also causing confusion). This commit replaces submodules with a checkout of addons and addons_contrib, covered by the .gitignore, and locale and developer tools are moved to the main repository. This also changes the paths: - /release/scripts are moved to the /scripts - /source/tools are moved to the /tools - /release/datafiles/locale is moved to /locale This is done to avoid conflicts when using bisect, and also allow buildbot to automatically "recover" wgen building older or newer branches/patches. Running `make update` will initialize the local checkout to the changed repository configuration. Another aspect of the change is that the make update will support Github style of remote organization (origin remote pointing to thy fork, upstream remote pointing to the upstream blender/blender.git). Pull Request #104755
226 lines
7.3 KiB
Python
226 lines
7.3 KiB
Python
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
import bpy
|
|
from bpy.types import Operator
|
|
from bpy.props import (
|
|
BoolProperty,
|
|
EnumProperty,
|
|
)
|
|
|
|
|
|
class VIEW3D_OT_edit_mesh_extrude_individual_move(Operator):
|
|
"""Extrude each individual face separately along local normals"""
|
|
bl_label = "Extrude Individual and Move"
|
|
bl_idname = "view3d.edit_mesh_extrude_individual_move"
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
obj = context.active_object
|
|
return (obj is not None and obj.mode == 'EDIT')
|
|
|
|
def execute(self, context):
|
|
mesh = context.object.data
|
|
select_mode = context.tool_settings.mesh_select_mode
|
|
|
|
totface = mesh.total_face_sel
|
|
totedge = mesh.total_edge_sel
|
|
# totvert = mesh.total_vert_sel
|
|
|
|
if select_mode[2] and totface == 1:
|
|
bpy.ops.mesh.extrude_region_move(
|
|
'INVOKE_REGION_WIN',
|
|
TRANSFORM_OT_translate={
|
|
"orient_type": 'NORMAL',
|
|
"constraint_axis": (False, False, True),
|
|
},
|
|
)
|
|
elif select_mode[2] and totface > 1:
|
|
bpy.ops.mesh.extrude_faces_move('INVOKE_REGION_WIN')
|
|
elif select_mode[1] and totedge >= 1:
|
|
bpy.ops.mesh.extrude_edges_move('INVOKE_REGION_WIN')
|
|
else:
|
|
bpy.ops.mesh.extrude_vertices_move('INVOKE_REGION_WIN')
|
|
|
|
# ignore return from operators above because they are 'RUNNING_MODAL',
|
|
# and cause this one not to be freed. #24671.
|
|
return {'FINISHED'}
|
|
|
|
def invoke(self, context, _event):
|
|
return self.execute(context)
|
|
|
|
|
|
class VIEW3D_OT_edit_mesh_extrude_move(Operator):
|
|
"""Extrude region together along the average normal"""
|
|
bl_label = "Extrude and Move on Normals"
|
|
bl_idname = "view3d.edit_mesh_extrude_move_normal"
|
|
|
|
dissolve_and_intersect: BoolProperty(
|
|
name="dissolve_and_intersect",
|
|
default=False,
|
|
description="Dissolves adjacent faces and intersects new geometry",
|
|
)
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
obj = context.active_object
|
|
return (obj is not None and obj.mode == 'EDIT')
|
|
|
|
@staticmethod
|
|
def extrude_region(context, use_vert_normals, dissolve_and_intersect):
|
|
mesh = context.object.data
|
|
|
|
totface = mesh.total_face_sel
|
|
totedge = mesh.total_edge_sel
|
|
# totvert = mesh.total_vert_sel
|
|
|
|
if totface >= 1:
|
|
if use_vert_normals:
|
|
bpy.ops.mesh.extrude_region_shrink_fatten(
|
|
'INVOKE_REGION_WIN',
|
|
TRANSFORM_OT_shrink_fatten={},
|
|
)
|
|
elif dissolve_and_intersect:
|
|
bpy.ops.mesh.extrude_manifold(
|
|
'INVOKE_REGION_WIN',
|
|
MESH_OT_extrude_region={
|
|
"use_dissolve_ortho_edges": True,
|
|
},
|
|
TRANSFORM_OT_translate={
|
|
"orient_type": 'NORMAL',
|
|
"constraint_axis": (False, False, True),
|
|
},
|
|
)
|
|
else:
|
|
bpy.ops.mesh.extrude_region_move(
|
|
'INVOKE_REGION_WIN',
|
|
TRANSFORM_OT_translate={
|
|
"orient_type": 'NORMAL',
|
|
"constraint_axis": (False, False, True),
|
|
},
|
|
)
|
|
|
|
elif totedge == 1:
|
|
bpy.ops.mesh.extrude_region_move(
|
|
'INVOKE_REGION_WIN',
|
|
TRANSFORM_OT_translate={
|
|
# Don't set the constraint axis since users will expect MMB
|
|
# to use the user setting, see: #61637
|
|
# "orient_type": 'NORMAL',
|
|
# Not a popular choice, too restrictive for retopo.
|
|
# "constraint_axis": (True, True, False)})
|
|
"constraint_axis": (False, False, False),
|
|
})
|
|
else:
|
|
bpy.ops.mesh.extrude_region_move('INVOKE_REGION_WIN')
|
|
|
|
# ignore return from operators above because they are 'RUNNING_MODAL',
|
|
# and cause this one not to be freed. #24671.
|
|
return {'FINISHED'}
|
|
|
|
def execute(self, context):
|
|
return VIEW3D_OT_edit_mesh_extrude_move.extrude_region(context, False, self.dissolve_and_intersect)
|
|
|
|
def invoke(self, context, _event):
|
|
return self.execute(context)
|
|
|
|
|
|
class VIEW3D_OT_edit_mesh_extrude_shrink_fatten(Operator):
|
|
"""Extrude region together along local normals"""
|
|
bl_label = "Extrude and Move on Individual Normals"
|
|
bl_idname = "view3d.edit_mesh_extrude_move_shrink_fatten"
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
obj = context.active_object
|
|
return (obj is not None and obj.mode == 'EDIT')
|
|
|
|
def execute(self, context):
|
|
return VIEW3D_OT_edit_mesh_extrude_move.extrude_region(context, True, False)
|
|
|
|
def invoke(self, context, _event):
|
|
return self.execute(context)
|
|
|
|
|
|
class VIEW3D_OT_edit_mesh_extrude_manifold_normal(Operator):
|
|
"""Extrude manifold region along normals"""
|
|
bl_label = "Extrude Manifold Along Normals"
|
|
bl_idname = "view3d.edit_mesh_extrude_manifold_normal"
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
obj = context.active_object
|
|
return (obj is not None and obj.mode == 'EDIT')
|
|
|
|
def execute(self, _context):
|
|
bpy.ops.mesh.extrude_manifold(
|
|
'INVOKE_REGION_WIN',
|
|
MESH_OT_extrude_region={
|
|
"use_dissolve_ortho_edges": True,
|
|
},
|
|
TRANSFORM_OT_translate={
|
|
"orient_type": 'NORMAL',
|
|
"constraint_axis": (False, False, True),
|
|
},
|
|
)
|
|
return {'FINISHED'}
|
|
|
|
def invoke(self, context, _event):
|
|
return self.execute(context)
|
|
|
|
|
|
class VIEW3D_OT_transform_gizmo_set(Operator):
|
|
"""Set the current transform gizmo"""
|
|
bl_label = "Transform Gizmo Set"
|
|
bl_options = {'REGISTER', 'UNDO'}
|
|
bl_idname = "view3d.transform_gizmo_set"
|
|
|
|
extend: BoolProperty(
|
|
name="Extend",
|
|
default=False,
|
|
)
|
|
type: EnumProperty(
|
|
name="Type",
|
|
items=(
|
|
('TRANSLATE', "Move", ""),
|
|
('ROTATE', "Rotate", ""),
|
|
('SCALE', "Scale", ""),
|
|
),
|
|
options={'ENUM_FLAG'},
|
|
)
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
area = context.area
|
|
return area and (area.type == 'VIEW_3D')
|
|
|
|
def execute(self, context):
|
|
space_data = context.space_data
|
|
space_data.show_gizmo = True
|
|
attrs = ("show_gizmo_object_translate", "show_gizmo_object_rotate", "show_gizmo_object_scale")
|
|
attr_active = tuple(
|
|
attrs[('TRANSLATE', 'ROTATE', 'SCALE').index(t)]
|
|
for t in self.type
|
|
)
|
|
if self.extend:
|
|
for attr in attrs:
|
|
if attr in attr_active:
|
|
setattr(space_data, attr, True)
|
|
else:
|
|
for attr in attrs:
|
|
setattr(space_data, attr, attr in attr_active)
|
|
return {'FINISHED'}
|
|
|
|
def invoke(self, context, event):
|
|
if not self.properties.is_property_set("extend"):
|
|
self.extend = event.shift
|
|
return self.execute(context)
|
|
|
|
|
|
classes = (
|
|
VIEW3D_OT_edit_mesh_extrude_individual_move,
|
|
VIEW3D_OT_edit_mesh_extrude_move,
|
|
VIEW3D_OT_edit_mesh_extrude_shrink_fatten,
|
|
VIEW3D_OT_edit_mesh_extrude_manifold_normal,
|
|
VIEW3D_OT_transform_gizmo_set,
|
|
)
|