blender/blender-addons
19
44
Fork 96
Code Issues 634 Pull Requests 28 Projects 1 Releases Wiki Activity

Rigify - saving pbone custom properties to metarig #104695

Merged
Alexander Gavrilov merged 6 commits from Andrej730/blender-addons:rigify_custom_props into main 2023-09-25 21:52:59 +02:00
Conversation 1 Commits 6 Files Changed 1 +37
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
rigify/utils/rig.py
View File

@ -295,6 +295,7 @@ def write_metarig(obj: ArmatureObject, layers=False, func_name="create",
"""
code = [
"import bpy\n",
"from rna_prop_ui import rna_idprop_ui_create\n",
"from mathutils import Color\n\n",
]
@ -412,6 +413,42 @@ def write_metarig(obj: ArmatureObject, layers=False, func_name="create",
code.append(" except AttributeError:")
code.append(" pass")
# Custom properties
custom_properties = {
property_name: value for property_name, value in pbone.items()
Alexander Gavrilov commented 2023-09-05 12:41:47 +02:00
Outdated
Review
Copy Link

Iterate over items() to get both key and value.

Iterate over `items()` to get both key and value.
Andrej commented 2023-09-09 18:59:46 +02:00
Outdated
Review
Copy Link

resolved in 3677cc4549

resolved in 3677cc454907e82731ac2360be5846d988e48e8c
if property_name not in pbone.bl_rna.properties.keys()
and type(pbone[property_name]) in (float, int)
}
if custom_properties:
code.append(' # custom properties')
for custom_property, current_value in custom_properties.items():
props_data = pbone.id_properties_ui(custom_property).as_dict()
code.append(f" rna_idprop_ui_create(")
code.append(f" pbone,")
code.append(f" {custom_property!r},")
code.append(f" default={props_data['default']!r},")
Alexander Gavrilov commented 2023-09-05 12:42:58 +02:00
Outdated
Review
Copy Link

What if the default isn't equal to the current value? This code doesn't preserve the value anywhere.

What if the default isn't equal to the current value? This code doesn't preserve the value anywhere.
Andrej commented 2023-09-09 19:00:05 +02:00
Outdated
Review
Copy Link

resolved in 3677cc4549

resolved in 3677cc454907e82731ac2360be5846d988e48e8c
Alexander Gavrilov commented 2023-09-25 12:18:35 +02:00
Outdated
Review
Copy Link

I'd quote default with repr too. Also, get rid of trailing spaces.

I'd quote default with repr too. Also, get rid of trailing spaces.
Andrej commented 2023-09-25 19:44:06 +02:00
Outdated
Review
Copy Link

resolved in 076763507e

resolved in 076763507e82ff209f546aba4b2ab03061254d9d
if 'min' in props_data:
code.append(f" min={props_data['min']},")
if 'max' in props_data:
code.append(f" max={props_data['max']},")
if 'soft_min' in props_data:
code.append(f" soft_min={props_data['soft_min']},")
if 'soft_max' in props_data:
code.append(f" soft_max={props_data['soft_max']},")
if 'subtype' in props_data:
code.append(f" subtype={props_data['subtype']!r},")
Alexander Gavrilov commented 2023-09-05 12:40:57 +02:00
Outdated
Review
Copy Link

Rather than doing '{foo}', use {repr(foo)}. Manual quoting could be barely tolerated for property names, but for the description it is simply unacceptable.

Rather than doing `'{foo}'`, use `{repr(foo)}`. Manual quoting could be barely tolerated for property names, but for the description it is simply unacceptable.
Andrej commented 2023-09-09 19:01:15 +02:00
Outdated
Review
Copy Link

that's really neat thing about repr, didn't know it can be used that way!
resolved in e2b63e1a4b

that's really neat thing about `repr`, didn't know it can be used that way! resolved in e2b63e1a4b07ffa8ca59eef5b4b2be17189f49ff
if 'description' in props_data:
code.append(f" description={props_data['description']!r},")
if 'precision' in props_data:
code.append(f" precision={props_data['precision']},")
if 'step' in props_data:
Alexander Gavrilov commented 2023-09-25 12:19:52 +02:00
Outdated
Review
Copy Link

This is still not using repr. Also, step and precision should now be supported directly by rna_idprop_ui_create, I fixed that recently.

This is still not using repr. Also, step and precision should now be supported directly by `rna_idprop_ui_create`, I fixed that recently.
Andrej commented 2023-09-25 19:59:55 +02:00
Outdated
Review
Copy Link

Resolved in ca78100418

Resolved in ca78100418069ed45b340504ffcb55a03327627e
code.append(f" step={props_data['step']},")
Alexander Gavrilov commented 2023-09-25 12:20:28 +02:00
Outdated
Review
Copy Link

If current_value is actually equal to default, this would be redundant.

If current_value is actually equal to default, this would be redundant.
Andrej commented 2023-09-25 19:44:35 +02:00
Outdated
Review
Copy Link

resolved in 076763507e

resolved in 076763507e82ff209f546aba4b2ab03061254d9d
code.append(f" )")
if props_data['default'] != current_value:
code.append(f" pbone[{custom_property!r}] = {current_value}")
# Constraints
for con in pbone.constraints:
code.append(" con = pbone.constraints.new(%r)" % con.type)