From 04390941050b1b790cbe812e9a8867cb56c93565 Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Wed, 10 Jun 2020 16:36:07 -0300 Subject: Cleanup: make the sculpt convert type follow transform convention --- .../editors/transform/transform_convert_sculpt.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/transform/transform_convert_sculpt.c') diff --git a/source/blender/editors/transform/transform_convert_sculpt.c b/source/blender/editors/transform/transform_convert_sculpt.c index b439c9a1731..0ac6bd9264f 100644 --- a/source/blender/editors/transform/transform_convert_sculpt.c +++ b/source/blender/editors/transform/transform_convert_sculpt.c @@ -39,7 +39,7 @@ * * \{ */ -void createTransSculpt(TransInfo *t) +void createTransSculpt(bContext *C, TransInfo *t) { TransData *td; @@ -99,6 +99,9 @@ void createTransSculpt(TransInfo *t) copy_m3_m3(td->smtx, obmat_inv); copy_m3_m4(td->mtx, ob->obmat); copy_m3_m4(td->axismtx, ob->obmat); + + BLI_assert(!(t->options & CTX_PAINT_CURVE)); + ED_sculpt_init_transform(C); } /** \} */ @@ -113,4 +116,16 @@ void recalcData_sculpt(TransInfo *t) ED_sculpt_update_modal_transform(t->context); } +void special_aftertrans_update__sculpt(bContext *C, TransInfo *t) +{ + Scene *scene = t->scene; + if (ID_IS_LINKED(scene)) { + /* `ED_sculpt_init_transform` was not called in this case. */ + return; + } + + BLI_assert(!(t->options & CTX_PAINT_CURVE)); + ED_sculpt_end_transform(C); +} + /** \} */ -- cgit v1.2.3