[Bf-blender-cvs] [a6ec402f5a8] master: Remove invalid assert
Campbell Barton
noreply at git.blender.org
Fri Jul 13 18:03:16 CEST 2018
Commit: a6ec402f5a8038718a2a034cf84f1f3f90b125ef
Author: Campbell Barton
Date: Fri Jul 13 17:59:26 2018 +0200
Branches: master
https://developer.blender.org/rBa6ec402f5a8038718a2a034cf84f1f3f90b125ef
Remove invalid assert
===================================================================
M source/blender/editors/undo/ed_undo.c
===================================================================
diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c
index b4268dac863..a13fa4af4e2 100644
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@ -130,7 +130,7 @@ static int ed_undo_step(bContext *C, int step, const char *undoname)
}
/* TODO(campbell), could use simple optimization. */
- BLI_assert(step_data_from_name != wm->undo_stack->step_active);
+ /* 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;
More information about the Bf-blender-cvs
mailing list