archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Naming + Style tweaks for newly added flag for Action Constraint

Browse Source 
Old names used could conflict with other things too easily in future
This commit is contained in:
Joshua Leung
2012-06-12 11:54:31 +00:00
parent 2062ca6b6c
commit 8489e100dc
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/constraint.c
View File

@@ -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); 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 */ /* 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; Object workob;
/* evaluate using workob */ /* evaluate using workob */

10
source/blender/makesdna/DNA_constraint_types.h
View File

@@ -561,11 +561,11 @@ typedef enum eSameVolume_Modes {
SAMEVOL_Z SAMEVOL_Z
} eSameVolume_Modes; } eSameVolume_Modes;
/* bActionConstraint.flag /* bActionConstraint.flag */
* WARNING: bitwise! */ typedef enum eActionConstraint_Flags {
typedef enum eAction_flags { /* Bones use "object" part of target action, instead of "same bone name" part */
BONE_USE_OBJECT_ACTION = 1 << 0, /* Bones use "object" part of target action, instead of "same bone name" part. */ ACTCON_BONE_USE_OBJECT_ACTION = (1 << 0),
} eAction_flags; } eActionConstraint_Flags;
/* Locked-Axis Values (Locked Track) */ /* Locked-Axis Values (Locked Track) */
typedef enum eLockAxis_Modes { typedef enum eLockAxis_Modes {

2
source/blender/makesrna/intern/rna_constraint.c
View File

@@ -1112,7 +1112,7 @@ static void rna_def_constraint_action(BlenderRNA *brna)
RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); 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); 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", RNA_def_property_ui_text(prop, "Object Action",
"Bones only: apply the object's transformation channels of the action " "Bones only: apply the object's transformation channels of the action "
"to the constrained bone, instead of bone's channels"); "to the constrained bone, instead of bone's channels");