[Bf-blender-cvs] [6c243b7e405] master: More tweaks to strict compiler flags

[Sergey Sharybin]

Commit: 6c243b7e4055fbbefaf52d94219bc9a70726eaeb
Author: Sergey Sharybin
Date:   Mon May 7 14:28:22 2018 +0200
Branches: master
https://developer.blender.org/rB6c243b7e4055fbbefaf52d94219bc9a70726eaeb

More tweaks to strict compiler flags

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

M	source/blender/editors/interface/view2d.c
M	source/blender/editors/sculpt_paint/sculpt.c

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

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: