More tweaks to strict compiler flags
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 7 May 2018 12:28:22 +0000 (14:28 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 7 May 2018 12:28:22 +0000 (14:28 +0200)
source/blender/editors/interface/view2d.c
source/blender/editors/sculpt_paint/sculpt.c

index d2907cb03ea53e28650c3b4e89783b11fcd1889f..f530130025b44d0d0d7bba8985143f4c61739132 100644 (file)
@@ -76,7 +76,7 @@ BLI_INLINE int clamp_float_to_int(const float f)
                return min;
        }
        else if (UNLIKELY(f > max)) {
-               return max;
+               return (int)max;
        }
        else {
                return (int)f;
index cc46263164742cfd3c5c6bca4ce1a94f33727b5d..f9bfe4be86640a3831bb6b1f33340d29ecc0d526 100644 (file)
@@ -1130,7 +1130,7 @@ static float brush_strength(
                                        return alpha * pressure * feather;
                        }
                        BLI_assert(!"Not supposed to happen");
-                       break;
+                       return 0.0f;
 
                case SCULPT_TOOL_CREASE:
                case SCULPT_TOOL_BLOB: