Skip to content

Commit c5cebb8

Browse files
committed
add_parameter validation incomplete pull from #7
fix: params incompatibility btwn superface and new rig_types
1 parent 51ac115 commit c5cebb8

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

__init__.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,14 +268,16 @@ class RigifyParameters(bpy.types.PropertyGroup):
268268
name = bpy.props.StringProperty()
269269

270270

271-
RIGIFY_PARAMETER_TABLE = { 'name': ('DEFAULT',bpy.props.StringProperty()) }
271+
RIGIFY_PARAMETER_TABLE = {'name': ('DEFAULT', bpy.props.StringProperty())}
272+
272273

273274
def format_property_spec(spec):
274275
"""Turns the return value of bpy.props.SomeProperty(...) into a readable string."""
275276
callback, params = spec
276-
param_str = ["%s=%r" % (k, v) for k,v in params.items()]
277+
param_str = ["%s=%r" % (k, v) for k, v in params.items()]
277278
return "%s(%s)" % (callback.__name__, ', '.join(param_str))
278279

280+
279281
class RigifyParameterValidator(object):
280282
"""
281283
A wrapper around RigifyParameters that verifies properties
@@ -343,6 +345,7 @@ def set_group(self, value):
343345

344346
##### REGISTER #####
345347

348+
346349
def register():
347350
ui.register()
348351
feature_sets.register()
@@ -454,14 +457,14 @@ def update_mode(self, context):
454457
for rig in rig_lists.rig_list:
455458
r = utils.get_rig_type(rig)
456459
try:
457-
r.add_parameters(RigifyParameters)
460+
r.add_parameters(RigifyParameterValidator(RigifyParameters, rig, RIGIFY_PARAMETER_TABLE))
458461
except AttributeError:
459462
pass
460463
else:
461464
for rig in rig_lists.rigs:
462465
r = rig_lists.rigs[rig]['module']
463466
try:
464-
r.add_parameters(RigifyParameters)
467+
r.add_parameters(RigifyParameterValidator(RigifyParameters, rig, RIGIFY_PARAMETER_TABLE))
465468
except AttributeError:
466469
pass
467470

rigs/experimental/bendy_eye.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,7 @@ def get_clustered(self):
974974

975975
params.make_deform = bpy.props.BoolProperty(
976976
name="Deform",
977-
default= True,
977+
default=True,
978978
description="Create a deform bone for the copy"
979979
)
980980

@@ -1015,9 +1015,6 @@ class EyeName(bpy.types.PropertyGroup):
10151015
IDStore = bpy.types.WindowManager
10161016
IDStore.other_eyes = bpy.props.CollectionProperty(type=EyeName)
10171017

1018-
params.set_paired = set_paired
1019-
params.get_paired = get_paired
1020-
10211018
params.paired_eye = bpy.props.StringProperty(
10221019
name='Paired eye',
10231020
default="",

rigs/faces/super_face.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,7 @@ def add_parameters(params):
10391039
)
10401040
params.primary_layers = bpy.props.BoolVectorProperty(
10411041
size=32,
1042-
description="Layers for the 1st tweak controls to be on",
1042+
description="Layers for the primary controls to be on",
10431043
default=tuple([i == 1 for i in range(0, 32)])
10441044
)
10451045
params.secondary_layers_extra = bpy.props.BoolProperty(
@@ -1049,7 +1049,7 @@ def add_parameters(params):
10491049
)
10501050
params.secondary_layers = bpy.props.BoolVectorProperty(
10511051
size=32,
1052-
description="Layers for the 2nd tweak controls to be on",
1052+
description="Layers for the secondary controls to be on",
10531053
default=tuple([i == 1 for i in range(0, 32)])
10541054
)
10551055

0 commit comments

Comments
 (0)