forked from bartvdbraak/blender
Naming + Style tweaks for newly added flag for Action Constraint
Old names used could conflict with other things too easily in future
This commit is contained in:
parent
2062ca6b6c
commit
8489e100dc
@ -2159,7 +2159,7 @@ static void actcon_get_tarmat(bConstraint *con, bConstraintOb *cob, bConstraintT
|
||||
printf("do Action Constraint %s - Ob %s Pchan %s\n", con->name, cob->ob->id.name + 2, (cob->pchan) ? cob->pchan->name : NULL);
|
||||
|
||||
/* Get the appropriate information from the action */
|
||||
if (cob->type == CONSTRAINT_OBTYPE_OBJECT || (data->flag & BONE_USE_OBJECT_ACTION)) {
|
||||
if (cob->type == CONSTRAINT_OBTYPE_OBJECT || (data->flag & ACTCON_BONE_USE_OBJECT_ACTION)) {
|
||||
Object workob;
|
||||
|
||||
/* evaluate using workob */
|
||||
|
@ -561,11 +561,11 @@ typedef enum eSameVolume_Modes {
|
||||
SAMEVOL_Z
|
||||
} eSameVolume_Modes;
|
||||
|
||||
/* bActionConstraint.flag
|
||||
* WARNING: bitwise! */
|
||||
typedef enum eAction_flags {
|
||||
BONE_USE_OBJECT_ACTION = 1 << 0, /* Bones use "object" part of target action, instead of "same bone name" part. */
|
||||
} eAction_flags;
|
||||
/* bActionConstraint.flag */
|
||||
typedef enum eActionConstraint_Flags {
|
||||
/* Bones use "object" part of target action, instead of "same bone name" part */
|
||||
ACTCON_BONE_USE_OBJECT_ACTION = (1 << 0),
|
||||
} eActionConstraint_Flags;
|
||||
|
||||
/* Locked-Axis Values (Locked Track) */
|
||||
typedef enum eLockAxis_Modes {
|
||||
|
@ -1112,7 +1112,7 @@ static void rna_def_constraint_action(BlenderRNA *brna)
|
||||
RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update");
|
||||
|
||||
prop = RNA_def_property(srna, "use_bone_object_action", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", BONE_USE_OBJECT_ACTION);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", ACTCON_BONE_USE_OBJECT_ACTION);
|
||||
RNA_def_property_ui_text(prop, "Object Action",
|
||||
"Bones only: apply the object's transformation channels of the action "
|
||||
"to the constrained bone, instead of bone's channels");
|
||||
|
Loading…
Reference in New Issue
Block a user