diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-06-01 21:44:12 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-06-01 21:44:12 +0400 |
| commit | d4c078b887adef4697c74e9c340525189f2fb2d6 (patch) | |
| tree | 9dd8dc49691ebb70d3d3bc885cd70de678cb613a | |
| parent | 27630f41a7ac9bd0677d0df5a301a86785397a89 (diff) | |
Fix T40342 smooth shading flag in dyntopo does not work under MSVC.
Classic case of integer flag AND-ing result passed to boolean and
failing.
| -rw-r--r-- | source/blender/makesrna/intern/rna_sculpt_paint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 54af55260e5..a3a06893522 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -226,8 +226,8 @@ static void rna_Sculpt_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *UNU WM_main_add_notifier(NC_OBJECT | ND_MODIFIER, ob); if (ob->sculpt) { - ob->sculpt->bm_smooth_shading = (scene->toolsettings->sculpt->flags & - SCULPT_DYNTOPO_SMOOTH_SHADING); + ob->sculpt->bm_smooth_shading = ((scene->toolsettings->sculpt->flags & + SCULPT_DYNTOPO_SMOOTH_SHADING) != 0); } } } @@ -238,7 +238,7 @@ static void rna_Sculpt_ShowDiffuseColor_update(Main *UNUSED(bmain), Scene *scene if (ob && ob->sculpt) { Sculpt *sd = scene->toolsettings->sculpt; - ob->sculpt->show_diffuse_color = sd->flags & SCULPT_SHOW_DIFFUSE; + ob->sculpt->show_diffuse_color = ((sd->flags & SCULPT_SHOW_DIFFUSE) != 0); if (ob->sculpt->pbvh) pbvh_show_diffuse_color_set(ob->sculpt->pbvh, ob->sculpt->show_diffuse_color); |