From 44d803c0098bea8a4ccbe67f57d8e71ddc3432bb Mon Sep 17 00:00:00 2001 From: Matthias Patscheider Date: Wed, 31 Jan 2024 17:26:01 +0200 Subject: [PATCH] #473 Regenerate Name uses USER_01 for renaming instead of user set name --- collider_conversion/regenerate_name.py | 4 +++- rigid_body/rigid_body.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/collider_conversion/regenerate_name.py b/collider_conversion/regenerate_name.py index d80eba3..c256235 100644 --- a/collider_conversion/regenerate_name.py +++ b/collider_conversion/regenerate_name.py @@ -1,6 +1,7 @@ from bpy.types import Operator from ..collider_shapes.add_bounding_primitive import OBJECT_OT_add_bounding_object +from ..groups.user_groups import get_groups_identifier default_shape = 'box_shape' default_group = 'USER_01' @@ -53,8 +54,9 @@ def execute(self, context): # get collider shape and group and set to default there is no previous data shape_identifier = default_shape if obj.get('collider_shape') is None else obj.get('collider_shape') user_group = default_group if obj.get('collider_group') is None else obj.get('collider_group') + group_identifier = get_groups_identifier(user_group) - new_name = OBJECT_OT_add_bounding_object.class_collider_name(shape_identifier, user_group, + new_name = OBJECT_OT_add_bounding_object.class_collider_name(shape_identifier, group_identifier, basename=basename) obj.name = new_name OBJECT_OT_add_bounding_object.set_data_name(obj, new_name, "_data") diff --git a/rigid_body/rigid_body.py b/rigid_body/rigid_body.py index 36cec6c..5e9f1d1 100644 --- a/rigid_body/rigid_body.py +++ b/rigid_body/rigid_body.py @@ -3,7 +3,7 @@ class OBJECT_OT_make_rigid_body(bpy.types.Operator): """Tooltip""" bl_idname = "object.set_rigid_body" - bl_label = "Make_rigid_body" + bl_label = "Set Rigid Body" bl_description = 'Convert object to be a rigid body' @classmethod @@ -15,7 +15,7 @@ def execute(self, context): for obj in bpy.context.selected_objects.copy(): new_name = obj.name - + if prefs.rigid_body_naming_position == 'SUFFIX': if not obj.name.endswith(prefs.rigid_body_extension): new_name = obj.name + prefs.rigid_body_separator + prefs.rigid_body_extension