Merge branch 'master' into blender2.8

2018-01-30 14:32:27 +01:00
parent b5cbc8bb60 b3c4a2a8da
commit 0d64857c3f
31 changed files with 243 additions and 87 deletions
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -216,11 +216,6 @@ static bool ED_object_editmode_load_ex(Main *bmain, Object *obedit, const bool f
 		if (freedata) ED_mball_editmball_free(obedit);
 	}

-	/* Tag update so no access to freed data referenced from
-	 * derived cache will happen.
-	 */
-	DEG_id_tag_update((ID *)obedit->data, 0);
-
 	return true;
 }