[Bf-blender-cvs] [77f2cb16865] blender-v3.2-release: Fix T98192: Crash when apply transforms after deleting an object
Campbell Barton
noreply at git.blender.org
Wed May 18 07:33:56 CEST 2022
Commit: 77f2cb168657bb2053d692013a4608329627cae3
Author: Campbell Barton
Date: Wed May 18 15:30:49 2022 +1000
Branches: blender-v3.2-release
https://developer.blender.org/rB77f2cb168657bb2053d692013a4608329627cae3
Fix T98192: Crash when apply transforms after deleting an object
===================================================================
M source/blender/editors/object/object_transform.cc
===================================================================
diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc
index da3df159c33..82e67231ec1 100644
--- a/source/blender/editors/object/object_transform.cc
+++ b/source/blender/editors/object/object_transform.cc
@@ -1125,7 +1125,7 @@ static int object_transform_apply_invoke(bContext *C, wmOperator *op, const wmEv
bool can_handle_multiuser = apply_objects_internal_can_multiuser(C);
bool need_single_user = can_handle_multiuser && apply_objects_internal_need_single_user(C);
- if ((ob->data != nullptr) && need_single_user) {
+ if ((ob != nullptr) && (ob->data != nullptr) && need_single_user) {
PropertyRNA *prop = RNA_struct_find_property(op->ptr, "isolate_users");
if (!RNA_property_is_set(op->ptr, prop)) {
RNA_property_boolean_set(op->ptr, prop, true);
More information about the Bf-blender-cvs
mailing list