griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Philipp Oeser
2025-02-26 15:38:50 +01:00
parent ef9742d5de bc3c6c4e7c
commit a8ed137e52
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/include/ED_sculpt.hh
View File

@@ -48,6 +48,7 @@ void keymap_sculpt(wmKeyConfig *keyconf);
/* `sculpt_transform.cc` */
void update_modal_transform(bContext *C, Object &ob);
void cancel_modal_transform(bContext *C, Object &ob);
void init_transform(bContext *C, Object &ob, const float mval_fl[2], const char *undo_name);
void end_transform(bContext *C, Object &ob);

10
source/blender/editors/sculpt_paint/sculpt_transform.cc
View File

@@ -576,6 +576,16 @@ void update_modal_transform(bContext *C, Object &ob)
flush_update_step(C, UpdateType::Position);
}
void cancel_modal_transform(bContext *C, Object &ob)
{
/* Cancelling "Elastic" transforms (due to its TransformDisplacementMode::Incremental nature),
* requires restoring positions from undo. For "All Vertices" there is no benefit in using the
* transform system to update to original positions either. */
Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C);
undo::restore_position_from_undo_step(*depsgraph, ob);
}
void end_transform(bContext *C, Object &ob)
{
SculptSession &ss = *ob.sculpt;

8
source/blender/editors/transform/transform_convert_sculpt.cc
View File

@@ -110,7 +110,13 @@ static void recalcData_sculpt(TransInfo *t)
{
BKE_view_layer_synced_ensure(t->scene, t->view_layer);
Object *ob = BKE_view_layer_active_object_get(t->view_layer);
sculpt_paint::update_modal_transform(t->context, *ob);
if (t->state == TRANS_CANCEL) {
sculpt_paint::cancel_modal_transform(t->context, *ob);
}
else {
sculpt_paint::update_modal_transform(t->context, *ob);
}
}
static void special_aftertrans_update__sculpt(bContext *C, TransInfo *t)