From dac4e48bb7f53f6b6ad509a13071e9ad8f1ca266 Mon Sep 17 00:00:00 2001 From: mano-wii Date: Tue, 11 Feb 2020 11:25:36 -0300 Subject: Fix Attempt to free NULL pointer Assert when snapping `Selection to ...` but without objects. --- source/blender/editors/space_view3d/view3d_snap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/space_view3d/view3d_snap.c') diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 33930efdd52..543dd88d38b 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -261,7 +261,10 @@ static int snap_sel_to_grid_exec(bContext *C, wmOperator *UNUSED(op)) DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM); } - MEM_freeN(objects_eval); + + if (objects_eval) { + MEM_freeN(objects_eval); + } if (use_transform_skip_children) { ED_object_xform_skip_child_container_update_all(xcs, bmain, depsgraph); -- cgit v1.2.3 From c939b4df18e9c8f2c4e1fafce5e9325840185a0b Mon Sep 17 00:00:00 2001 From: mano-wii Date: Tue, 11 Feb 2020 11:45:07 -0300 Subject: Fix Attempt to free NULL pointer Assert when snapping `Selection to ...` but without objects. Missed in the last commit. --- source/blender/editors/space_view3d/view3d_snap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/space_view3d/view3d_snap.c') diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 543dd88d38b..020e44ef0c3 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -554,7 +554,10 @@ static int snap_selected_to_location(bContext *C, DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM); } } - MEM_freeN(objects); + + if (objects) { + MEM_freeN(objects); + } if (use_transform_skip_children) { ED_object_xform_skip_child_container_update_all(xcs, bmain, depsgraph); -- cgit v1.2.3