diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-13 19:04:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-13 19:04:41 +0300 |
| commit | 135b7f5c6ab5761669256d1f15e37122ec9533cb (patch) | |
| tree | c2d48d4279c2c5dc6a06cafb01b4ca8207a7392b /source/blender/editors/undo | |
| parent | 7774ad7dd3fbdd6335922fb5c04a43bf163bae38 (diff) | |
| parent | a6ec402f5a8038718a2a034cf84f1f3f90b125ef (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/undo')
| -rw-r--r-- | source/blender/editors/undo/ed_undo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c index b604b1db56f..14592149579 100644 --- a/source/blender/editors/undo/ed_undo.c +++ b/source/blender/editors/undo/ed_undo.c @@ -131,9 +131,8 @@ static int ed_undo_step(bContext *C, int step, const char *undoname) return OPERATOR_CANCELLED; } - /* happens on redo. */ - // BLI_assert(step_data_from_name != wm->undo_stack->step_active); - /* TODO(campbell): could use simple optimization. */ + /* TODO(campbell), could use simple optimization. */ + /* Pointers match on redo. */ step_for_callback = ( BLI_findindex(&wm->undo_stack->steps, step_data_from_name) < BLI_findindex(&wm->undo_stack->steps, wm->undo_stack->step_active)) ? 1 : -1; |