[Bf-blender-cvs] [94dc6ceaa78] master: Cleanup: remove assert left in by accident, outdated comment

Campbell Barton noreply at git.blender.org
Thu Feb 25 06:35:48 CET 2021


Commit: 94dc6ceaa78c360de9e3e9403b6f1fb73400aad0
Author: Campbell Barton
Date:   Thu Feb 25 16:33:55 2021 +1100
Branches: master
https://developer.blender.org/rB94dc6ceaa78c360de9e3e9403b6f1fb73400aad0

Cleanup: remove assert left in by accident, outdated comment

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

M	source/blender/editors/metaball/editmball_undo.c
M	source/blender/editors/screen/screendump.c

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

diff --git a/source/blender/editors/metaball/editmball_undo.c b/source/blender/editors/metaball/editmball_undo.c
index 170d25e5a16..457c5330595 100644
--- a/source/blender/editors/metaball/editmball_undo.c
+++ b/source/blender/editors/metaball/editmball_undo.c
@@ -224,9 +224,6 @@ static void mball_undosys_step_decode(struct bContext *C,
       CTX_data_scene(C), CTX_data_view_layer(C), us->elems[0].obedit_ref.ptr, us_p->name, &LOG);
 
   /* Check after setting active. */
-
-  BLI_assert(BKE_object_is_in_editmode(us->elems[0].obedit_ref.ptr));
-
   BLI_assert(mball_undosys_poll(C));
 
   bmain->is_memfile_undo_flush_needed = true;
diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c
index 7d7a3340dc3..ff0dab7f1c7 100644
--- a/source/blender/editors/screen/screendump.c
+++ b/source/blender/editors/screen/screendump.c
@@ -229,7 +229,6 @@ static bool screenshot_poll(bContext *C)
 
 void SCREEN_OT_screenshot(wmOperatorType *ot)
 {
-  /* weak: opname starting with 'save' makes filewindow give save-over */
   ot->name = "Save Screenshot";
   ot->idname = "SCREEN_OT_screenshot";
   ot->description = "Capture a picture of the active area or whole Blender window";



More information about the Bf-blender-cvs mailing list