Fix merge errors

7 files changed, 10 insertions, 11 deletions

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index c88bdd7ee9d..482b705a21d 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -3231,7 +3231,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 
     if (!DNA_struct_elem_find(fd->filesdna, "Mesh", "float", "voxel_size")) {
       for (Mesh *me = bmain->meshes.first; me; me = me->id.next) {
-        me->voxel_size = 0.1f;
+        me->remesh_voxel_size = 0.1f;
       }
     }
 
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c
index 452557f9d66..0bdd170f500 100644
--- a/source/blender/editors/mesh/editmesh_add.c
+++ b/source/blender/editors/mesh/editmesh_add.c
@@ -102,7 +102,6 @@ static void make_prim_finish(bContext *C,
     // TODO: Find a better place to init this
     Mesh *me;
     me = obedit->data;
-    me->voxel_size = 0.1f;
   }
   WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, obedit);
 }
diff --git a/source/blender/editors/object/object_blueprint.c b/source/blender/editors/object/object_blueprint.c
index c5ccc053f94..c34d4102fcb 100644
--- a/source/blender/editors/object/object_blueprint.c
+++ b/source/blender/editors/object/object_blueprint.c
@@ -1000,7 +1000,7 @@ int blueprint_update_step(bContext *C,
 
   Main *bmain = CTX_data_main(C);
   Scene *scene = CTX_data_scene(C);
-  Depsgraph *depsgraph = CTX_data_depsgraph(C);
+  Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C);
 
   if (event->type == ESCKEY && event->val == KM_PRESS) {
     blueprint_end(C, op);
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 0f94bb50983..d9fcb4894ba 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1838,12 +1838,12 @@ static int remesh_exec(bContext *C, wmOperator *op)
     Mesh *mesh = ob->data;
     Mesh *newMesh;
 
-    if (mesh->voxel_size <= 0.0f) {
+    if (mesh->remesh_voxel_size <= 0.0f) {
       return OPERATOR_CANCELLED;
     }
 
     if (ob->mode == OB_MODE_SCULPT) {
-      Depsgraph *depsgraph = CTX_data_depsgraph(C);
+      Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C);
       BKE_sculpt_update_object_for_edit(depsgraph, ob, true, true);
       PBVH *pbvh;
       PBVHNode **nodes;
@@ -1856,7 +1856,7 @@ static int remesh_exec(bContext *C, wmOperator *op)
 
     struct OpenVDBLevelSet *level_set;
     struct OpenVDBTransform *xform = OpenVDBTransform_create();
-    OpenVDBTransform_create_linear_transform(xform, (double)mesh->voxel_size);
+    OpenVDBTransform_create_linear_transform(xform, (double)mesh->remesh_voxel_size);
     level_set = BKE_remesh_voxel_ovdb_mesh_to_level_set_create(mesh, xform);
     newMesh = BKE_remesh_voxel_ovdb_volume_to_mesh_nomain(level_set, 0.0, 0.0, false);
     OpenVDBLevelSet_free(level_set);
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 54bb5698331..b85a50b4cb2 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -2551,7 +2551,7 @@ static bool remesh_update_check(bContext *C, wmOperator *op)
 
 static bool remesh_csg_poll(bContext *C)
 {
-  return edit_modifier_poll_generic(C, &RNA_RemeshModifier, 0);
+  return edit_modifier_poll_generic(C, &RNA_RemeshModifier, 0, false);
 }
 
 static int remesh_csg_add_exec(bContext *C, wmOperator *op)
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index 7224fab0f3a..8b010991e65 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -1357,7 +1357,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
         GPU_matrix_push_projection();
         GPU_matrix_push();
         ED_view3d_draw_setup_view(CTX_wm_window(C),
-                                  CTX_data_depsgraph(C),
+                                  CTX_data_depsgraph_pointer(C),
                                   CTX_data_scene(C),
                                   ar,
                                   CTX_wm_view3d(C),
@@ -1407,7 +1407,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
             GPU_matrix_push_projection();
             GPU_matrix_push();
             ED_view3d_draw_setup_view(CTX_wm_window(C),
-                                      CTX_data_depsgraph(C),
+                                      CTX_data_depsgraph_pointer(C),
                                       CTX_data_scene(C),
                                       ar,
                                       CTX_wm_view3d(C),
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 1ff13e944ae..6ba471de09b 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -2289,7 +2289,7 @@ static void wpaint_do_symmetrical_brush_actions(
 static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, PointerRNA *itemptr)
 {
   Scene *scene = CTX_data_scene(C);
-  Depsgraph *depsgraph = CTX_data_depsgraph(C);
+  Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C);
   ToolSettings *ts = CTX_data_tool_settings(C);
   VPaint *wp = ts->wpaint;
   Brush *brush = BKE_paint_brush(&wp->paint);
@@ -3301,7 +3301,7 @@ static void vpaint_do_symmetrical_brush_actions(
 static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, PointerRNA *itemptr)
 {
   Scene *scene = CTX_data_scene(C);
-  Depsgraph *depsgraph = CTX_data_depsgraph(C);
+  Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C);
   ToolSettings *ts = CTX_data_tool_settings(C);
   struct VPaintData *vpd = paint_stroke_mode_data(stroke);
   VPaint *vp = ts->vpaint;