diff options
author | Joshua Leung <aligorith@gmail.com> | 2013-02-28 14:27:04 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2013-02-28 14:27:04 +0400 |
commit | 1700cf87173202a4662f63d4f8514ed8c46fe65e (patch) | |
tree | 6df61e794c52bbbdf4b4925ff480c4502b0d5644 /source/blender/blenkernel/intern/fcurve.c | |
parent | ac6c218cf423ab2ea059ea169df54250ed81af97 (diff) |
Bugfix: Types mismatch (flags and targetFlags were ints, but dtar->flag is a
short)
Diffstat (limited to 'source/blender/blenkernel/intern/fcurve.c')
-rw-r--r-- | source/blender/blenkernel/intern/fcurve.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 64480980acd..e31e26f6c1d 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -986,9 +986,9 @@ typedef struct DriverVarTypeInfo { float (*get_value)(ChannelDriver *driver, DriverVar *dvar); /* allocation of target slots */ - int num_targets; /* number of target slots required */ + int num_targets; /* number of target slots required */ const char *target_names[MAX_DRIVER_TARGETS]; /* UI names that should be given to the slots */ - int target_flags[MAX_DRIVER_TARGETS]; /* flags defining the requirements for each slot */ + short target_flags[MAX_DRIVER_TARGETS]; /* flags defining the requirements for each slot */ } DriverVarTypeInfo; /* Macro to begin definitions */ @@ -1497,7 +1497,7 @@ void driver_change_variable_type(DriverVar *dvar, int type) */ DRIVER_TARGETS_USED_LOOPER(dvar) { - int flags = dvti->target_flags[tarIndex]; + short flags = dvti->target_flags[tarIndex]; /* store the flags */ dtar->flag = flags; |