[Bf-blender-cvs] [8e88af99348] blender-v3.1-release: Fix wrong object mode checking in snap code

Germano Cavalcante noreply at git.blender.org
Tue Mar 1 20:30:50 CET 2022


Commit: 8e88af99348590e9879dcbfe97bbbc180fc5ec67
Author: Germano Cavalcante
Date:   Tue Mar 1 16:11:38 2022 -0300
Branches: blender-v3.1-release
https://developer.blender.org/rB8e88af99348590e9879dcbfe97bbbc180fc5ec67

Fix wrong object mode checking in snap code

The value of `OB_MODE_OBJECT` is 0, this makes it unsuitable as a bitflag.

Issue pointed out at https://pvs-studio.com/en/blog/posts/cpp/0922/

Thanks to Andrey Karpov

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

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 dc9315b6d5a..515a4360bb5 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -491,7 +491,7 @@ static void iter_snap_objects(SnapObjectContext *sctx,
       }
     }
     else if (snap_select == SNAP_NOT_SELECTED) {
-      if (is_object_active && !(base->object->mode & OB_MODE_OBJECT)) {
+      if (is_object_active && base->object->mode != OB_MODE_OBJECT) {
         /* Pass. Consider the selection of elements being edited. */
       }
       else if ((base->flag & BASE_SELECTED) || (base->flag_legacy & BA_WAS_SEL)) {



More information about the Bf-blender-cvs mailing list