[Bf-blender-cvs] [89a843b7dc3] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 89a843b7dc329bd688e3d558c4b53c0816bb0a6f
Author: Antonio Vazquez
Date:   Thu Jun 7 14:39:29 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB89a843b7dc329bd688e3d558c4b53c0816bb0a6f

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index da7fe0060ab,8510687ebab..8623ff42a5a
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@@ -1846,16 -1849,16 +1846,16 @@@ void DepsgraphRelationBuilder::build_ob
  	}
  	/* Link object data evaluation node to exit operation. */
  	OperationKey obdata_geom_eval_key(obdata,
 -	                                  DEG_NODE_TYPE_GEOMETRY,
 -	                                  DEG_OPCODE_PLACEHOLDER,
 -	                                  "Geometry Eval");
 +		DEG_NODE_TYPE_GEOMETRY,
 +		DEG_OPCODE_PLACEHOLDER,
 +		"Geometry Eval");
  	OperationKey obdata_geom_done_key(obdata,
 -	                                  DEG_NODE_TYPE_GEOMETRY,
 -	                                  DEG_OPCODE_PLACEHOLDER,
 -	                                  "Eval Done");
 +		DEG_NODE_TYPE_GEOMETRY,
 +		DEG_OPCODE_PLACEHOLDER,
 +		"Eval Done");
  	add_relation(obdata_geom_eval_key,
- 		obdata_geom_done_key,
- 		"ObData Geom Eval Done");
+ 	             obdata_geom_done_key,
+ 	             "ObData Geom Eval Done");
  	/* Type-specific links. */
  	const ID_Type id_type = GS(obdata->name);
  	switch (id_type) {
diff --cc source/blender/editors/animation/anim_channels_defines.c
index 24c0fcd4710,e4213a8d907..610713af70e
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@@ -64,8 -64,8 +64,9 @@@
  
  #include "BKE_animsys.h"
  #include "BKE_curve.h"
 +#include "BKE_gpencil.h"
  #include "BKE_key.h"
+ #include "BKE_main.h"
  #include "BKE_nla.h"
  #include "BKE_context.h"
  
diff --cc source/blender/editors/animation/anim_deps.c
index a613de148ec,adb5a10c19d..ca30fbced8d
--- a/source/blender/editors/animation/anim_deps.c
+++ b/source/blender/editors/animation/anim_deps.c
@@@ -432,18 -432,9 +432,18 @@@ void ANIM_animdata_update(bAnimContext 
  		else if (ale->datatype == ALE_NLASTRIP) {
  			if (ale->update & ANIM_UPDATE_DEPS) {
  				ale->update &= ~ANIM_UPDATE_DEPS;
- 				ANIM_list_elem_update(ac->scene, ale);
+ 				ANIM_list_elem_update(ac->bmain, ac->scene, ale);
  			}
  		}
 +		else if (ale->update) {
 +			if (G.debug & G_DEBUG) {
 +				printf("%s: Unhandled animchannel updates (%d) for type=%d (%p)\n",
 +				       __func__, ale->update, ale->type, ale->data);
 +			}
 +
 +			/* Prevent crashes in cases where it can't be handled */
 +			ale->update = 0;
 +		}
  
  		BLI_assert(ale->update == 0);
  	}
diff --cc source/blender/modifiers/intern/MOD_meshsequencecache.c
index 5c3df796765,5ebf67b8d5f..3a13185003b
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@@ -197,13 -202,9 +202,13 @@@ ModifierTypeInfo modifierType_MeshSeque
  	/* deformMatrices */    NULL,
  	/* deformVertsEM */     NULL,
  	/* deformMatricesEM */  NULL,
- 	/* applyModifier */     NULL,
+ 	/* applyModifier */     applyModifier,
  	/* applyModifierEM */   NULL,
  
 +	/* gp_deformStroke */      NULL,
 +	/* gp_generateStrokes */   NULL,
 +	/* gp_bakeModifier */      NULL,
 +
  	/* initData */          initData,
  	/* requiredDataMask */  NULL,
  	/* freeData */          freeData,