From 1700cf87173202a4662f63d4f8514ed8c46fe65e Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Thu, 28 Feb 2013 10:27:04 +0000 Subject: Bugfix: Types mismatch (flags and targetFlags were ints, but dtar->flag is a short) --- source/blender/blenkernel/intern/fcurve.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel/intern/fcurve.c') 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; -- cgit v1.2.3