diff options
Diffstat (limited to 'source/blender/modifiers/intern/MOD_remesh.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_remesh.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index a76b3acb783..197d759c352 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -190,8 +190,8 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *UNUSED(ctx) break; } /* TODO(jbakker): Dualcon crashes when run in parallel. Could be related to incorrect - * input data or that the library isn't thread safe. This was identified when changing the task - * isolations during T76553. */ + * input data or that the library isn't thread safe. + * This was identified when changing the task isolation's during T76553. */ static ThreadMutex dualcon_mutex = BLI_MUTEX_INITIALIZER; BLI_mutex_lock(&dualcon_mutex); output = dualcon(&input, @@ -241,7 +241,7 @@ static void panel_draw(const bContext *C, Panel *panel) { uiLayout *layout = panel->layout; #ifdef WITH_MOD_REMESH - uiLayout *row; + uiLayout *row, *col; PointerRNA ptr; PointerRNA ob_ptr; @@ -253,16 +253,17 @@ static void panel_draw(const bContext *C, Panel *panel) uiLayoutSetPropSep(layout, true); + col = uiLayoutColumn(layout, false); if (mode == MOD_REMESH_VOXEL) { - uiItemR(layout, &ptr, "voxel_size", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "adaptivity", 0, NULL, ICON_NONE); + uiItemR(col, &ptr, "voxel_size", 0, NULL, ICON_NONE); + uiItemR(col, &ptr, "adaptivity", 0, NULL, ICON_NONE); } else { - uiItemR(layout, &ptr, "octree_depth", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "scale", 0, NULL, ICON_NONE); + uiItemR(col, &ptr, "octree_depth", 0, NULL, ICON_NONE); + uiItemR(col, &ptr, "scale", 0, NULL, ICON_NONE); if (mode == MOD_REMESH_SHARP_FEATURES) { - uiItemR(layout, &ptr, "sharpness", 0, NULL, ICON_NONE); + uiItemR(col, &ptr, "sharpness", 0, NULL, ICON_NONE); } uiItemR(layout, &ptr, "use_remove_disconnected", 0, NULL, ICON_NONE); @@ -316,4 +317,6 @@ ModifierTypeInfo modifierType_Remesh = { /* foreachTexLink */ NULL, /* freeRuntimeData */ NULL, /* panelRegister */ panelRegister, + /* blendWrite */ NULL, + /* blendRead */ NULL, }; |