Differential D3101 Diff 10404 source/blender/blenkernel/intern/object_update.c

Changeset View

Standalone View

source/blender/blenkernel/intern/object_update.c

Show First 20 Lines • Show All 166 Lines • ▼ Show 20 Lines	if (key && key->block.first) {
if (!(ob->shapeflag & OB_SHAPE_LOCK))		if (!(ob->shapeflag & OB_SHAPE_LOCK))
BKE_animsys_evaluate_animdata(scene, &key->id, key->adt, ctime, ADT_RECALC_DRIVERS);		BKE_animsys_evaluate_animdata(scene, &key->id, key->adt, ctime, ADT_RECALC_DRIVERS);
}		}

/* includes all keys and modifiers */		/* includes all keys and modifiers */
switch (ob->type) {		switch (ob->type) {
case OB_MESH:		case OB_MESH:
{		{
		#if 0
BMEditMesh *em = (ob->mode & OB_MODE_EDIT) ? BKE_editmesh_from_object(ob) : NULL;		BMEditMesh *em = (ob->mode & OB_MODE_EDIT) ? BKE_editmesh_from_object(ob) : NULL;
		#else
		BMEditMesh em = (ob->mode & OB_MODE_EDIT) ? ((Mesh )ob->data)->edit_btmesh : NULL;
		if (em && em->ob != ob) {
		em = NULL;
		}
		#endif

		mont29Unsubmitted Not Done Inline Actions Don't think this is needed anymore, since `BKE_editmesh_from_object` has already be changed? mont29: Don't think this is needed anymore, since `BKE_editmesh_from_object` has already be changed?
uint64_t data_mask = scene->customdata_mask \| CD_MASK_BAREMESH;		uint64_t data_mask = scene->customdata_mask \| CD_MASK_BAREMESH;
#ifdef WITH_FREESTYLE		#ifdef WITH_FREESTYLE
/* make sure Freestyle edge/face marks appear in DM for render (see T40315) */		/* make sure Freestyle edge/face marks appear in DM for render (see T40315) */
if (eval_ctx->mode != DAG_EVAL_VIEWPORT) {		if (eval_ctx->mode != DAG_EVAL_VIEWPORT) {
data_mask \|= CD_MASK_FREESTYLE_EDGE \| CD_MASK_FREESTYLE_FACE;		data_mask \|= CD_MASK_FREESTYLE_EDGE \| CD_MASK_FREESTYLE_FACE;
}		}
#endif		#endif
if (em) {		if (em) {
▲ Show 20 Lines • Show All 279 Lines • Show Last 20 Lines