Commit: 0e1b4e10a26d40fb3f8d45966c133790a26732b1
Author: Joshua Leung
Date: Mon Mar 14 01:01:43 2016 +1300
Branches: master
https://developer.blender.org/rB0e1b4e10a26d40fb3f8d45966c133790a26732b1
Fixed some type mismatch errors, missed earlier
(CMake MSVC's output makes it really difficult to spot errors when they occur!)
===================================================================
M source/blender/editors/animation/keyingsets.c
===================================================================
diff --git a/source/blender/editors/animation/keyingsets.c
b/source/blender/editors/animation/keyingsets.c
index 060f66f..8071805 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -955,9 +955,9 @@ int ANIM_apply_keyingset(bContext *C, ListBase *dsources,
bAction *act, KeyingSe
ReportList *reports = CTX_wm_reports(C);
KS_Path *ksp;
const short base_kflags = ANIM_get_keyframing_flags(scene, 1);
- short kflag = 0, success = 0;
const char *groupname = NULL;
- const char *keytype = scene->toolsettings->keyframe_type;
+ short kflag = 0, success = 0;
+ char keytype = scene->toolsettings->keyframe_type;
/* sanity checks */
if (ks == NULL)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
