archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix merge errors

Browse Source
This commit is contained in:
Pablo Dobarro
2019-08-20 19:19:26 +02:00
parent 8c509bb69c
commit 2ecb4540f3
7 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/intern/versioning_280.c
View File

@@ -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;
}
}

1
source/blender/editors/mesh/editmesh_add.c
View File

@@ -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);
}

2
source/blender/editors/object/object_blueprint.c
View File

@@ -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);

6
source/blender/editors/object/object_edit.c
View File

@@ -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);

2
source/blender/editors/object/object_modifier.c
View File

@@ -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)

4
source/blender/editors/sculpt_paint/paint_cursor.c
View File

@@ -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),

4
source/blender/editors/sculpt_paint/paint_vertex.c
View File

@@ -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;