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

[Campbell Barton]

Commit: 54f9a6e5da06e671f7640c9ec3ac3c305644beb6
Author: Campbell Barton
Date:   Wed Oct 18 16:40:31 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB54f9a6e5da06e671f7640c9ec3ac3c305644beb6

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesrna/intern/rna_fcurve.c
index e951e15ca8c,f7da5a0fda4..90c4ec53b45
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@@ -588,8 -586,9 +588,9 @@@ static void rna_FModifier_blending_rang
  static void rna_FModifier_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
  {
  	ID *id = ptr->id.data;
+ 	FModifier *fcm = (FModifier *)ptr->data;
  	AnimData *adt = BKE_animdata_from_id(id);
 -	DAG_id_tag_update(id, (GS(id->name) == ID_OB) ? OB_RECALC_OB : OB_RECALC_DATA);
 +	DEG_id_tag_update(id, (GS(id->name) == ID_OB) ? OB_RECALC_OB : OB_RECALC_DATA);
  	if (adt != NULL) {
  		adt->recalc |= ADT_RECALC_ANIM;
  	}