Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 16:04:41 +0000 (18:04 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 16:04:41 +0000 (18:04 +0200)
source/blender/editors/undo/ed_undo.c

index b604b1db56f0c4a7593d41195a5c8bbb94c3af45..1459214957916e246118bcfad5ea01bd53377cd9 100644 (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;