[Bf-blender-cvs] [6b40ec46ea0] temp-T97479-3d-texturing-undo: Remove unneeded changes to sculpt_undo. It wasn't the cause of the original issue.

Jeroen Bakker noreply at git.blender.org
Mon May 16 15:32:23 CEST 2022


Commit: 6b40ec46ea021076a54abb870d29a4cf3a1d7041
Author: Jeroen Bakker
Date:   Mon May 16 15:31:56 2022 +0200
Branches: temp-T97479-3d-texturing-undo
https://developer.blender.org/rB6b40ec46ea021076a54abb870d29a4cf3a1d7041

Remove unneeded changes to sculpt_undo. It wasn't the cause of the original issue.

===================================================================

M	source/blender/editors/sculpt_paint/sculpt_undo.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c
index 40e1ba717f0..5867dc558de 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@ -1783,7 +1783,6 @@ void ED_sculpt_undosys_type(UndoType *ut)
 
 static UndoSculpt *sculpt_undosys_step_get_nodes(UndoStep *us_p)
 {
-  BLI_assert(us_p != NULL);
   SculptUndoStep *us = (SculptUndoStep *)us_p;
   return &us->data;
 }
@@ -1792,9 +1791,6 @@ static UndoSculpt *sculpt_undo_get_nodes(void)
 {
   UndoStack *ustack = ED_undo_stack_get();
   UndoStep *us = BKE_undosys_stack_init_or_active_with_type(ustack, BKE_UNDOSYS_TYPE_SCULPT);
-  if (us == NULL) {
-    return NULL;
-  }
   return sculpt_undosys_step_get_nodes(us);
 }



More information about the Bf-blender-cvs mailing list