[Bf-blender-cvs] [1f3547fb3e4] blender-v3.1-release: Fix minor error in last commit (4b35d6)

Germano Cavalcante noreply at git.blender.org
Thu Mar 24 09:07:14 CET 2022


Commit: 1f3547fb3e4c41277cc48a36e56d032c2ba7677e
Author: Germano Cavalcante
Date:   Tue Mar 22 17:30:03 2022 -0300
Branches: blender-v3.1-release
https://developer.blender.org/rB1f3547fb3e4c41277cc48a36e56d032c2ba7677e

Fix minor error in last commit (4b35d6)

If there is no active object, it is to be expected that we are in
object mode as well.

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

M	source/blender/editors/transform/transform_snap_object.c

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

diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index eb1a007c9e7..0f5e4707db0 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -510,7 +510,7 @@ static void iter_snap_objects(SnapObjectContext *sctx,
     return;
   }
 
-  const bool is_in_object_mode = base_act && base_act->object->mode == OB_MODE_OBJECT;
+  const bool is_in_object_mode = !base_act || base_act->object->mode == OB_MODE_OBJECT;
   for (Base *base = view_layer->object_bases.first; base != NULL; base = base->next) {
     if (!snap_object_is_snappable(sctx, snap_select, base_act, base, is_in_object_mode)) {
       continue;



More information about the Bf-blender-cvs mailing list