Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 4 Apr 2018 08:36:39 +0000 (10:36 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 4 Apr 2018 08:36:39 +0000 (10:36 +0200)
1  2 
source/blender/blenkernel/intern/armature_update.c

index 54f1a353486a3a6a8505a327817e039ef728ce66,77f7819d2bef72066298023b0ac6a6e89f2066bd..5b51cd9502f498cd36d3bc04f51d038c36d33ff5
@@@ -558,7 -551,16 +558,16 @@@ void BKE_splineik_execute_tree
  
  /* *************** Depsgraph evaluation callbacks ************ */
  
 -void BKE_pose_eval_init(EvaluationContext *UNUSED(eval_ctx),
+ 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(const struct EvaluationContext *UNUSED(eval_ctx),
                          Scene *UNUSED(scene),
                          Object *ob)
  {