[Bf-blender-cvs] [c47b8dab51e] temp-outliner-library-override-hierarchy: Fix minor error in last commit (4b35d6)

Germano Cavalcante noreply at git.blender.org
Fri Mar 25 14:17:18 CET 2022


Commit: c47b8dab51e1353d20d31e537b96cf1e69cb726c
Author: Germano Cavalcante
Date:   Tue Mar 22 17:30:03 2022 -0300
Branches: temp-outliner-library-override-hierarchy
https://developer.blender.org/rBc47b8dab51e1353d20d31e537b96cf1e69cb726c

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 0879f35506a..87053fe03d1 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -496,7 +496,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