[Bf-blender-cvs] [85acd72c9be] master: Fix remesher operator poll function

Pablo Dobarro noreply at git.blender.org
Wed Sep 18 19:44:19 CEST 2019


Commit: 85acd72c9bed3e1d13a58a65786c5f1bbcc79720
Author: Pablo Dobarro
Date:   Wed Sep 18 16:55:08 2019 +0200
Branches: master
https://developer.blender.org/rB85acd72c9bed3e1d13a58a65786c5f1bbcc79720

Fix remesher operator poll function

This commit also removes the name "voxel" from the messages because this function
is now used for the voxel remesher and quadriflow.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D5842

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

M	source/blender/editors/object/object_remesh.c

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

diff --git a/source/blender/editors/object/object_remesh.c b/source/blender/editors/object/object_remesh.c
index 393f63d2177..d4e7ee04da8 100644
--- a/source/blender/editors/object/object_remesh.c
+++ b/source/blender/editors/object/object_remesh.c
@@ -78,12 +78,13 @@ static bool object_remesh_poll(bContext *C)
   }
 
   if (BKE_object_is_in_editmode(ob)) {
-    CTX_wm_operator_poll_msg_set(C, "The voxel remesher cannot run from edit mode.");
+    CTX_wm_operator_poll_msg_set(C, "The remesher cannot run from edit mode.");
     return false;
   }
 
   if (ob->mode == OB_MODE_SCULPT && ob->sculpt->bm) {
-    CTX_wm_operator_poll_msg_set(C, "The voxel remesher cannot run with dyntopo activated.");
+    CTX_wm_operator_poll_msg_set(C, "The remesher cannot run with dyntopo activated.");
+    return false;
   }
 
   return ED_operator_object_active_editable_mesh(C);



More information about the Bf-blender-cvs mailing list