From e53921cf40af1ecb7ee9da55401c7c2737ed2c39 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sun, 19 Dec 2010 09:41:41 +0000 Subject: Bugfix #25292 In sculpt mode, Object transform still worked, which was: 1) Not undo-able (sculpt undo stack) 2) Clearing the entire sculpt undo stack on operator redo 3) Had keymap conflict for R Simply added check for this case and return trans operator. --- source/blender/editors/transform/transform_conversions.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/editors/transform') diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 0dbcfd76ecc..1029501b036 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -5391,6 +5391,9 @@ void createTransData(bContext *C, TransInfo *t) sort_trans_data_dist(t); } } + else if (ob && (ob->mode & OB_MODE_SCULPT)) { + /* sculpt mode has own undo stack, transform ops redo clears sculpt undo stack */ + } else { createTransObject(C, t); t->flag |= T_OBJECT; -- cgit v1.2.3