diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-02-11 04:34:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-02-11 04:34:41 +0300 |
| commit | 52cfc620c8cc3125282d8dd66df312ffb576569c (patch) | |
| tree | 2a8a44c61a76de8289dfbe603127b00576ad0407 /source/blender/editors/transform/transform_convert_sculpt.c | |
| parent | 2d252b6d26f90f81f2a2dc7a3031c407dc8a643c (diff) | |
Fix T83013: Annotation with hidden object in sculpt mode crashes
This just avoids the crash, the annotation tool still doesn't work.
Larger changes will be needed to resolve this, see T85532.
Diffstat (limited to 'source/blender/editors/transform/transform_convert_sculpt.c')
| -rw-r--r-- | source/blender/editors/transform/transform_convert_sculpt.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform_convert_sculpt.c b/source/blender/editors/transform/transform_convert_sculpt.c index 0ac6bd9264f..70fec49d77d 100644 --- a/source/blender/editors/transform/transform_convert_sculpt.c +++ b/source/blender/editors/transform/transform_convert_sculpt.c @@ -49,7 +49,7 @@ void createTransSculpt(bContext *C, TransInfo *t) return; } - Object *ob = CTX_data_active_object(t->context); + Object *ob = OBACT(t->view_layer); SculptSession *ss = ob->sculpt; { @@ -101,7 +101,7 @@ void createTransSculpt(bContext *C, TransInfo *t) copy_m3_m4(td->axismtx, ob->obmat); BLI_assert(!(t->options & CTX_PAINT_CURVE)); - ED_sculpt_init_transform(C); + ED_sculpt_init_transform(C, ob); } /** \} */ @@ -113,7 +113,8 @@ void createTransSculpt(bContext *C, TransInfo *t) void recalcData_sculpt(TransInfo *t) { - ED_sculpt_update_modal_transform(t->context); + Object *ob = OBACT(t->view_layer); + ED_sculpt_update_modal_transform(t->context, ob); } void special_aftertrans_update__sculpt(bContext *C, TransInfo *t) @@ -124,8 +125,9 @@ void special_aftertrans_update__sculpt(bContext *C, TransInfo *t) return; } + Object *ob = OBACT(t->view_layer); BLI_assert(!(t->options & CTX_PAINT_CURVE)); - ED_sculpt_end_transform(C); + ED_sculpt_end_transform(C, ob); } /** \} */ |