Merge branch 'master' into blender2.8

2017-11-23 11:42:06 +01:00
parent 99f5180435 f3fa5c1258
commit 7ba1babc90
12 changed files with 352 additions and 352 deletions
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -147,7 +147,7 @@ void deg_graph_flush_updates(Main *bmain, Depsgraph *graph)
 			}

 			if (comp_node->done != COMPONENT_STATE_DONE) {
-				/* Currently this is needed to get ob->mesh to be replaced with
+				/* Currently this is needed to get object->mesh to be replaced with
 				 * original mesh (rather than being evaluated_mesh).
 				 *
 				 * TODO(sergey): This is something we need to avoid.