From a567bef5ccae851316868ee427f97e214c2afe61 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Fri, 1 Apr 2022 23:22:17 -0500 Subject: Fix: Assert with set origin operation and single active object Array has bounds checking that a raw pointer didn't have before. --- source/blender/editors/object/object_transform.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc index 36d70eeef64..235ffb61738 100644 --- a/source/blender/editors/object/object_transform.cc +++ b/source/blender/editors/object/object_transform.cc @@ -1263,12 +1263,12 @@ static int object_origin_set_exec(bContext *C, wmOperator *op) } /* reset flags */ - for (int object_index = 0; object_index < objects.size(); object_index++) { + for (const int object_index : objects.index_range()) { Object *ob = objects[object_index]; ob->flag &= ~OB_DONE; /* move active first */ - if (ob == obact) { + if (ob == obact && objects.size() > 1) { memmove(&objects[1], objects.data(), object_index * sizeof(Object *)); objects[0] = ob; } -- cgit v1.2.3