diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-02-11 04:40:07 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-02-11 04:40:07 +0300 |
commit | ed1945c801747830a9716cc9951ee2c59defabed (patch) | |
tree | 9140d30c4631c04e72dea9ccd73bb76485563a4f /source/blender/editors/sculpt_paint | |
parent | 175325ebdb5b7f52363f7ea1ff544920f4ffb52a (diff) | |
parent | 52cfc620c8cc3125282d8dd66df312ffb576569c (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors/sculpt_paint')
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_transform.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt_transform.c b/source/blender/editors/sculpt_paint/sculpt_transform.c index da8204fd57c..4554ea178ab 100644 --- a/source/blender/editors/sculpt_paint/sculpt_transform.c +++ b/source/blender/editors/sculpt_paint/sculpt_transform.c @@ -60,10 +60,9 @@ #include <math.h> #include <stdlib.h> -void ED_sculpt_init_transform(struct bContext *C) +void ED_sculpt_init_transform(struct bContext *C, Object *ob) { Sculpt *sd = CTX_data_tool_settings(C)->sculpt; - Object *ob = CTX_data_active_object(C); SculptSession *ss = ob->sculpt; Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); @@ -220,10 +219,9 @@ static void sculpt_transform_all_vertices(Sculpt *sd, Object *ob) 0, ss->filter_cache->totnode, &data, sculpt_transform_task_cb, &settings); } -void ED_sculpt_update_modal_transform(struct bContext *C) +void ED_sculpt_update_modal_transform(struct bContext *C, Object *ob) { Sculpt *sd = CTX_data_tool_settings(C)->sculpt; - Object *ob = CTX_data_active_object(C); SculptSession *ss = ob->sculpt; Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); @@ -243,9 +241,8 @@ void ED_sculpt_update_modal_transform(struct bContext *C) SCULPT_flush_update_step(C, SCULPT_UPDATE_COORDS); } -void ED_sculpt_end_transform(struct bContext *C) +void ED_sculpt_end_transform(struct bContext *C, Object *ob) { - Object *ob = CTX_data_active_object(C); SculptSession *ss = ob->sculpt; if (ss->filter_cache) { SCULPT_filter_cache_free(ss); |