Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-04-10 10:57:55 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-04-10 11:06:16 +0300
commitb7a09114f66f05b50c42a3b2c2ca3253dda64e5b (patch)
tree4a4dfb6a865655aad7892df7d45675285d81441d /source
parente8fc6f694651a1f64df40e9ea9f57e916966609d (diff)
Fix T63441: Cycles applies modifiers twice
Was a mistake in df26f28835f, which caused access uninitialized variable.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/mesh_convert.c2
1 files changed, 1 insertions, 1 deletions
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 {