[Bf-blender-cvs] [b7a09114f66] master: Fix T63441: Cycles applies modifiers twice

[Sergey Sharybin]

Commit: b7a09114f66f05b50c42a3b2c2ca3253dda64e5b
Author: Sergey Sharybin
Date:   Wed Apr 10 09:57:55 2019 +0200
Branches: master
https://developer.blender.org/rBb7a09114f66f05b50c42a3b2c2ca3253dda64e5b

Fix T63441: Cycles applies modifiers twice

Was a mistake in df26f28835f, which caused access uninitialized variable.

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

M	source/blender/blenkernel/intern/mesh_convert.c

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

diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c
index bc59c1bd502..5be4b8524b1 100644
--- a/source/blender/blenkernel/intern/mesh_convert.c
+++ b/source/blender/blenkernel/intern/mesh_convert.c
@@ -876,7 +876,7 @@ Mesh *BKE_mesh_new_from_object(
 		 * The other types of object has them applied, but are stored in other
 		 * data structures than a mesh. So need to apply modifiers again on a
 		 * temporary copy before converting result to mesh. */
-		if (object_for_eval.type == OB_MESH) {
+		if (object_input->type == OB_MESH) {
 			effective_apply_modifiers = false;
 		}
 		else {