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
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2015-08-28 13:40:52 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-08-28 13:40:52 +0300
commitbf88428b7e3dd2da314e7964ae6dfe754dc2eed8 (patch)
tree5e653d17eb7195ce54899462352800c717e6a0a1 /source/blender/blenkernel
parente515d64c3e11f8d4ff89c6df89716282c039df19 (diff)
Fix T45930 weights not appearing in editmode when show weights option
was enabled. Caused by an -unneeded now- fix for opensubdiv. Code caused the vertex colors to be uninitialized. Thanks to Sergey for confirming that initial issue is no longer a problem.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/DerivedMesh.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 6249e10d56f..6c3564167b6 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2266,12 +2266,9 @@ static void editbmesh_calc_modifiers(
#if 0 /* XXX Will re-enable this when we have global mod stack options. */
const bool do_final_wmcol = (scene->toolsettings->weights_preview == WP_WPREVIEW_FINAL) && do_wmcol;
#endif
-#ifndef WITH_OPENSUBDIV
const bool do_final_wmcol = false;
const bool do_init_wmcol = ((((Mesh *)ob->data)->drawflag & ME_DRAWEIGHT) && !do_final_wmcol);
-#else
- const bool do_init_wmcol = false;
-#endif
+
const bool do_init_statvis = ((((Mesh *)ob->data)->drawflag & ME_DRAW_STATVIS) && !do_init_wmcol);
const bool do_mod_wmcol = do_init_wmcol;
VirtualModifierData virtualModifierData;