Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-05-07 15:29:54 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-05-07 15:29:54 +0300
commit77f2f23a7ebceda3187a2f5ceab79a46a9537574 (patch)
tree910d6fbd5e5c07cc009f8ada0ec2733183428a96 /source/blender/editors/sculpt_paint
parent57013c0a39ac75f22eda1a76bb18881fa590b18a (diff)
parent6c243b7e4055fbbefaf52d94219bc9a70726eaeb (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/sculpt_paint')
-rw-r--r--source/blender/editors/sculpt_paint/sculpt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 38fbb609283..5f5fa044f1e 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -1127,7 +1127,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: