Commit: 3b556a477d0741eb26d10a2e91979353346011f7
Author: Bastien Montagne
Date: Thu Jun 7 18:45:45 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3b556a477d0741eb26d10a2e91979353346011f7
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/sculpt_paint/sculpt_undo.c
===================================================================
===================================================================
diff --cc source/blender/editors/sculpt_paint/paint_vertex.c
index 52c096b712e,7bbb4467f6f..dab207d7350
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@@ -974,7 -944,7 +974,7 @@@ static void vertex_paint_init_session(D
if (ob->sculpt == NULL) {
ob->sculpt = MEM_callocN(sizeof(SculptSession), "sculpt
session");
- BKE_sculpt_update_mesh_elements(depsgraph, scene,
scene->toolsettings->sculpt, ob, 0, false);
- BKE_sculpt_update_mesh_elements(scene,
scene->toolsettings->sculpt, ob, false, false);
++ BKE_sculpt_update_mesh_elements(depsgraph, scene,
scene->toolsettings->sculpt, ob, false, false);
}
}
diff --cc source/blender/editors/sculpt_paint/sculpt.c
index 985857d3f7a,40d11e0197b..ad8ed59ff5c
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@@ -5628,8 -5616,7 +5628,8 @@@ static void sculpt_init_session(Depsgra
BKE_sculpt_toolsettings_data_ensure(scene);
ob->sculpt = MEM_callocN(sizeof(SculptSession), "sculpt session");
- BKE_sculpt_update_mesh_elements(scene, scene->toolsettings->sculpt, ob,
false, false);
+ ob->sculpt->mode_type = OB_MODE_SCULPT;
- BKE_sculpt_update_mesh_elements(depsgraph, scene,
scene->toolsettings->sculpt, ob, 0, false);
++ BKE_sculpt_update_mesh_elements(depsgraph, scene,
scene->toolsettings->sculpt, ob, false, false);
}
static int ed_object_sculptmode_flush_recalc_flag(Scene *scene, Object *ob,
MultiresModifierData *mmd)
diff --cc source/blender/editors/sculpt_paint/sculpt_undo.c
index bc51606f3e5,bf5ddeb71ff..01b879a4c34
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@@ -158,7 -156,7 +158,7 @@@ static bool sculpt_undo_restore_coords(
if (kb) {
ob->shapenr = BLI_findindex(&key->block, kb) +
1;
- BKE_sculpt_update_mesh_elements(depsgraph,
scene, sd, ob, 0, false);
- BKE_sculpt_update_mesh_elements(scene, sd, ob,
false, false);
++ BKE_sculpt_update_mesh_elements(depsgraph,
scene, sd, ob, false, false);
WM_event_add_notifier(C, NC_OBJECT | ND_DATA,
ob);
}
else {
@@@ -493,12 -490,10 +493,12 @@@ static void sculpt_undo_restore_list(bC
}
}
- BKE_sculpt_update_mesh_elements(scene, sd, ob, false, need_mask);
+ DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
+
- BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, 0, need_mask);
++ BKE_sculpt_update_mesh_elements(depsgraph, scene, sd, ob, false,
need_mask);
/* call _after_ sculpt_update_mesh_elements() which may update
'ob->derivedFinal' */
- dm = mesh_get_derived_final(scene, ob, 0);
+ dm = mesh_get_derived_final(depsgraph, scene, ob, 0);
if (lb->first && sculpt_undo_bmesh_restore(C, lb->first, ob, ss))
return;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
