sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton 2018-07-13 18:04:41 +02:00
commit 135b7f5c6a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/undo/ed_undo.c
View File

@ -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;