[Bf-blender-cvs] [c526a34fc2f] master: Cleanup: Fix strict compiler warning
Sergey Sharybin
noreply at git.blender.org
Tue Aug 18 14:41:03 CEST 2020
Commit: c526a34fc2fe0d51a81837bd49dbc0b78c8b5224
Author: Sergey Sharybin
Date: Tue Aug 18 14:37:53 2020 +0200
Branches: master
https://developer.blender.org/rBc526a34fc2fe0d51a81837bd49dbc0b78c8b5224
Cleanup: Fix strict compiler warning
===================================================================
M source/blender/blenkernel/intern/paint.c
===================================================================
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index f6e744096bb..e3c209b60e6 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -1437,10 +1437,9 @@ static bool sculpt_modifiers_active(Scene *scene, Sculpt *sd, Object *ob)
{
ModifierData *md;
Mesh *me = (Mesh *)ob->data;
- MultiresModifierData *mmd = BKE_sculpt_multires_active(scene, ob);
VirtualModifierData virtualModifierData;
- if (mmd || ob->sculpt->bm) {
+ if (ob->sculpt->bm || BKE_sculpt_multires_active(scene, ob)) {
return false;
}
More information about the Bf-blender-cvs
mailing list