[Bf-blender-cvs] [a6999a869ef] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: a6999a869ef1db4a758d946564fa001dcaf60f37
Author: Sergey Sharybin
Date:   Wed Apr 4 11:49:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa6999a869ef1db4a758d946564fa001dcaf60f37

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
index 6a7f9eaea25,4e1de16235c..8a2cab2d0fb
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
@@@ -121,10 -120,10 +122,11 @@@ void DepsgraphNodeBuilder::build_spline
  	bPoseChannel *rootchan = BKE_armature_splineik_solver_find_root(pchan, data);
  
  	/* Operation node for evaluating/running Spline IK Solver.
 -	 * Store the "root bone" of this chain in the solver, so it knows where to start.
 +	 * Store the "root bone" of this chain in the solver, so it knows where to
 +	 * start.
  	 */
  	int rootchan_index = BLI_findindex(&object->pose->chanbase, rootchan);
+ 	BLI_assert(rootchan_index != -1);
  	add_operation_node(&object->id, DEG_NODE_TYPE_EVAL_POSE, rootchan->name,
  	                   function_bind(BKE_pose_splineik_evaluate,
  	                                 _1,