[Bf-blender-cvs] [25ab35faaed] quadriflow: More quadriflow UI tweaks

Sebastian Parborg noreply at git.blender.org
Wed Sep 11 18:38:32 CEST 2019


Commit: 25ab35faaed9e6db2e1bacf37aba3af4238ad4e0
Author: Sebastian Parborg
Date:   Wed Sep 11 18:39:07 2019 +0200
Branches: quadriflow
https://developer.blender.org/rB25ab35faaed9e6db2e1bacf37aba3af4238ad4e0

More quadriflow UI tweaks

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

M	release/scripts/startup/bl_ui/properties_data_mesh.py
M	source/blender/blenkernel/intern/mesh_remesh_voxel.c
M	source/blender/blenloader/intern/versioning_280.c
M	source/blender/makesdna/DNA_mesh_types.h
M	source/blender/makesrna/intern/rna_mesh.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index 8031690970d..891d80e3747 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -470,7 +470,7 @@ class DATA_PT_remesh(MeshButtonsPanel, Panel):
         row = layout.row()
 
         mesh = context.mesh
-        row.prop(mesh, "remesh_mode", text="Mode")
+        row.prop(mesh, "remesh_mode", text="Mode", expand=True)
         col = layout.column()
         if (mesh.remesh_mode == 'VOXEL'):
             col.prop(mesh, "remesh_voxel_size")
diff --git a/source/blender/blenkernel/intern/mesh_remesh_voxel.c b/source/blender/blenkernel/intern/mesh_remesh_voxel.c
index 48ccca8213d..ff7ff947e1d 100644
--- a/source/blender/blenkernel/intern/mesh_remesh_voxel.c
+++ b/source/blender/blenkernel/intern/mesh_remesh_voxel.c
@@ -220,6 +220,13 @@ static Mesh *BKE_mesh_remesh_quadriflow(Mesh *input_mesh,
     return NULL;
   }
 
+  if (qrd.out_totfaces == 0) {
+    /* Meshing failed */
+    MEM_freeN(qrd.out_faces);
+    MEM_freeN(qrd.out_verts);
+    return NULL;
+  }
+
   /* Construct the new output mesh */
   Mesh *mesh = BKE_mesh_new_nomain(
       qrd.out_totverts, 0, 0, (qrd.out_totfaces * 4), qrd.out_totfaces);
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 11e45c5395b..d06da062d49 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -3844,8 +3844,5 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 
   {
     /* Versioning code until next subversion bump goes here. */
-    for (Mesh *mesh = bmain->meshes.first; mesh; mesh = mesh->id.next) {
-      mesh->remesh_mode = REMESH_VOXEL;
-    }
   }
 }
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 9b6b885e330..070180d0a24 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -264,8 +264,8 @@ enum {
 
 /* me->remesh_mode */
 enum {
-  REMESH_VOXEL = 1 << 0,
-  REMESH_QUAD = 1 << 1,
+  REMESH_VOXEL = 0,
+  REMESH_QUAD = 1,
 };
 
 /* Subsurf Type */
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 294b19e37fd..98bd607c7e8 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -56,8 +56,8 @@ const EnumPropertyItem rna_enum_mesh_delimit_mode_items[] = {
 };
 
 const EnumPropertyItem rna_enum_mesh_remesh_mode_items[] = {
-    {REMESH_VOXEL, "VOXEL", 0, "Voxel Remesher", "Use the voxel remesher"},
-    {REMESH_QUAD, "QUAD", 0, "Quad Remesher", "Use the quad remesher"},
+    {REMESH_VOXEL, "VOXEL", 0, "Voxel", "Use the voxel remesher"},
+    {REMESH_QUAD, "QUAD", 0, "Quad", "Use the quad remesher"},
     {0, NULL, 0, NULL, NULL},
 };



More information about the Bf-blender-cvs mailing list