Commit: e217fb439ffab5dbd979ff261f6a2d816f7d7c83 Author: Sergey Sharybin Date: Wed Apr 4 10:36:39 2018 +0200 Branches: blender2.8 https://developer.blender.org/rBe217fb439ffab5dbd979ff261f6a2d816f7d7c83
Merge branch 'master' into blender2.8 =================================================================== =================================================================== diff --cc source/blender/blenkernel/intern/armature_update.c index 54f1a353486,77f7819d2be..5b51cd9502f --- a/source/blender/blenkernel/intern/armature_update.c +++ b/source/blender/blenkernel/intern/armature_update.c @@@ -558,7 -551,16 +558,16 @@@ void BKE_splineik_execute_tree /* *************** Depsgraph evaluation callbacks ************ */ + BLI_INLINE bPoseChannel *pose_pchan_get_indexed(Object *ob, int pchan_index) + { + bPose *pose = ob->pose; + BLI_assert(pose != NULL); + BLI_assert(pchan_index >= 0); + BLI_assert(pchan_index < MEM_allocN_len(pose->chan_array) / sizeof(bPoseChannel *)); + return pose->chan_array[pchan_index]; + } + -void BKE_pose_eval_init(EvaluationContext *UNUSED(eval_ctx), +void BKE_pose_eval_init(const struct EvaluationContext *UNUSED(eval_ctx), Scene *UNUSED(scene), Object *ob) { _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs