[Bf-blender-cvs] [e8209c36e61] master: Cleanup: Deduplicate code

Germano Cavalcante noreply at git.blender.org
Fri May 22 19:59:04 CEST 2020


Commit: e8209c36e61dda0b1f2a84c9d2567892c3de6a66
Author: Germano Cavalcante
Date:   Fri May 22 14:58:56 2020 -0300
Branches: master
https://developer.blender.org/rBe8209c36e61dda0b1f2a84c9d2567892c3de6a66

Cleanup: Deduplicate code

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

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

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

diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c
index 68faddd2060..0a6e0d6b7f5 100644
--- a/source/blender/editors/transform/transform_constraints.c
+++ b/source/blender/editors/transform/transform_constraints.c
@@ -640,36 +640,22 @@ void setUserConstraint(TransInfo *t, short orientation, int mode, const char fte
   BLI_snprintf(text, sizeof(text), ftext, spacename);
 
   switch (orientation) {
-    case V3D_ORIENT_GLOBAL: {
-      setConstraint(t, mode, text);
-      break;
-    }
     case V3D_ORIENT_LOCAL:
       setLocalConstraint(t, mode, text);
       break;
     case V3D_ORIENT_NORMAL:
       if (checkUseAxisMatrix(t)) {
         setAxisMatrixConstraint(t, mode, text);
+        break;
       }
-      else {
-        setConstraint(t, mode, text);
-      }
-      break;
+      ATTR_FALLTHROUGH;
+    case V3D_ORIENT_GLOBAL:
     case V3D_ORIENT_VIEW:
-      setConstraint(t, mode, text);
-      break;
     case V3D_ORIENT_CURSOR:
-      setConstraint(t, mode, text);
-      break;
     case V3D_ORIENT_GIMBAL:
-      setConstraint(t, mode, text);
-      break;
     case V3D_ORIENT_CUSTOM_MATRIX:
-      setConstraint(t, mode, text);
-      break;
     case V3D_ORIENT_CUSTOM:
     default: {
-      BLI_assert(orientation >= V3D_ORIENT_CUSTOM);
       setConstraint(t, mode, text);
       break;
     }



More information about the Bf-blender-cvs mailing list