diff options
Diffstat (limited to 'source/blender/blenkernel/intern/anim_sys.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 8692ff2767d..8542bd65933 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -74,7 +74,7 @@ /* Getter/Setter -------------------------------------------- */ /* Check if ID can have AnimData */ -short id_type_can_have_animdata(ID *id) +bool id_type_can_have_animdata(ID *id) { /* sanity check */ if (id == NULL) @@ -157,10 +157,10 @@ AnimData *BKE_id_add_animdata(ID *id) /* Action Setter --------------------------------------- */ /* Called when user tries to change the active action of an AnimData block (via RNA, Outliner, etc.) */ -short BKE_animdata_set_action(ReportList *reports, ID *id, bAction *act) +bool BKE_animdata_set_action(ReportList *reports, ID *id, bAction *act) { AnimData *adt = BKE_animdata_from_id(id); - short ok = 0; + bool ok = false; /* animdata validity check */ if (adt == NULL) { @@ -279,7 +279,7 @@ AnimData *BKE_copy_animdata(AnimData *adt, const bool do_action) return dadt; } -int BKE_copy_animdata_id(ID *id_to, ID *id_from, const bool do_action) +bool BKE_copy_animdata_id(ID *id_to, ID *id_from, const bool do_action) { AnimData *adt; @@ -567,7 +567,7 @@ static bool check_rna_path_is_valid(ID *owner_id, const char *path) /* Check if some given RNA Path needs fixing - free the given path and set a new one as appropriate * NOTE: we assume that oldName and newName have [" "] padding around them */ -static char *rna_path_rename_fix(ID *owner_id, const char *prefix, const char *oldName, const char *newName, char *oldpath, int verify_paths) +static char *rna_path_rename_fix(ID *owner_id, const char *prefix, const char *oldName, const char *newName, char *oldpath, bool verify_paths) { char *prefixPtr = strstr(oldpath, prefix); char *oldNamePtr = strstr(oldpath, oldName); @@ -626,7 +626,7 @@ static char *rna_path_rename_fix(ID *owner_id, const char *prefix, const char *o /* Check RNA-Paths for a list of F-Curves */ static void fcurves_path_rename_fix(ID *owner_id, const char *prefix, const char *oldName, const char *newName, - const char *oldKey, const char *newKey, ListBase *curves, int verify_paths) + const char *oldKey, const char *newKey, ListBase *curves, bool verify_paths) { FCurve *fcu; @@ -654,7 +654,7 @@ static void fcurves_path_rename_fix(ID *owner_id, const char *prefix, const char /* Check RNA-Paths for a list of Drivers */ static void drivers_path_rename_fix(ID *owner_id, ID *ref_id, const char *prefix, const char *oldName, const char *newName, - const char *oldKey, const char *newKey, ListBase *curves, int verify_paths) + const char *oldKey, const char *newKey, ListBase *curves, bool verify_paths) { FCurve *fcu; @@ -695,7 +695,7 @@ static void drivers_path_rename_fix(ID *owner_id, ID *ref_id, const char *prefix /* Fix all RNA-Paths for Actions linked to NLA Strips */ static void nlastrips_path_rename_fix(ID *owner_id, const char *prefix, const char *oldName, const char *newName, - const char *oldKey, const char *newKey, ListBase *strips, int verify_paths) + const char *oldKey, const char *newKey, ListBase *strips, bool verify_paths) { NlaStrip *strip; @@ -720,7 +720,7 @@ static void nlastrips_path_rename_fix(ID *owner_id, const char *prefix, const ch * i.e. pose.bones["Bone"] */ void BKE_action_fix_paths_rename(ID *owner_id, bAction *act, const char *prefix, const char *oldName, - const char *newName, int oldSubscript, int newSubscript, int verify_paths) + const char *newName, int oldSubscript, int newSubscript, bool verify_paths) { char *oldN, *newN; @@ -759,7 +759,7 @@ void BKE_action_fix_paths_rename(ID *owner_id, bAction *act, const char *prefix, * i.e. pose.bones["Bone"] */ void BKE_animdata_fix_paths_rename(ID *owner_id, AnimData *adt, ID *ref_id, const char *prefix, const char *oldName, - const char *newName, int oldSubscript, int newSubscript, int verify_paths) + const char *newName, int oldSubscript, int newSubscript, bool verify_paths) { NlaTrack *nlt; char *oldN, *newN; @@ -1259,7 +1259,7 @@ void BKE_keyingsets_free(ListBase *list) * - path: original path string (as stored in F-Curve data) * - dst: destination string to write data to */ -static short animsys_remap_path(AnimMapper *UNUSED(remap), char *path, char **dst) +static bool animsys_remap_path(AnimMapper *UNUSED(remap), char *path, char **dst) { /* is there a valid remapping table to use? */ #if 0 @@ -1279,7 +1279,7 @@ static short animsys_remap_path(AnimMapper *UNUSED(remap), char *path, char **ds #define ANIMSYS_FLOAT_AS_BOOL(value) ((value) > ((1.0f - FLT_EPSILON))) /* Write the given value to a setting using RNA, and return success */ -static short animsys_write_rna_setting(PointerRNA *ptr, char *path, int array_index, float value) +static bool animsys_write_rna_setting(PointerRNA *ptr, char *path, int array_index, float value) { PropertyRNA *prop; PointerRNA new_ptr; @@ -1409,11 +1409,11 @@ static short animsys_write_rna_setting(PointerRNA *ptr, char *path, int array_in } /* Simple replacement based data-setting of the FCurve using RNA */ -static short animsys_execute_fcurve(PointerRNA *ptr, AnimMapper *remap, FCurve *fcu) +static bool animsys_execute_fcurve(PointerRNA *ptr, AnimMapper *remap, FCurve *fcu) { char *path = NULL; - short free_path = 0; - short ok = 0; + bool free_path = false; + bool ok = false; /* get path, remapped as appropriate to work in its new environment */ free_path = animsys_remap_path(remap, fcu->rna_path, &path); @@ -1463,7 +1463,7 @@ static void animsys_evaluate_drivers(PointerRNA *ptr, AnimData *adt, float ctime */ for (fcu = adt->drivers.first; fcu; fcu = fcu->next) { ChannelDriver *driver = fcu->driver; - short ok = 0; + bool ok = false; /* check if this driver's curve should be skipped */ if ((fcu->flag & (FCURVE_MUTED | FCURVE_DISABLED)) == 0) { |