diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-07 15:28:22 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-07 15:28:22 +0300 |
| commit | 6c243b7e4055fbbefaf52d94219bc9a70726eaeb (patch) | |
| tree | f0441d420ccaf22d0140f4b52defa681270451dc /source | |
| parent | 592c3881bae4b063e88444d8341aa5b488b5abb5 (diff) | |
More tweaks to strict compiler flags
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/view2d.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index d2907cb03ea..f530130025b 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -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; diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index cc462631647..f9bfe4be866 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -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: |