[Bf-blender-cvs] [cbaa9f723bb] sculpt-dev: Sculpt: fix gcc compiler error
Joseph Eagar
noreply at git.blender.org
Mon Oct 11 17:37:10 CEST 2021
Commit: cbaa9f723bb9aa59c1bc1608b2908dc6b0d11b77
Author: Joseph Eagar
Date: Mon Oct 11 08:36:00 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rBcbaa9f723bb9aa59c1bc1608b2908dc6b0d11b77
Sculpt: fix gcc compiler error
This one is an actual error. I
went through the trouble of compiling
in a linux VM and still somehow managed
to miss it.
Also fix wrong range for normal_radius_factor.
===================================================================
M source/blender/blenkernel/BKE_brush.h
M source/blender/blenkernel/intern/brush_channel_define.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h
index cf38239d948..78401f66b92 100644
--- a/source/blender/blenkernel/BKE_brush.h
+++ b/source/blender/blenkernel/BKE_brush.h
@@ -167,7 +167,7 @@ void BKE_brush_default_input_curves_set(struct Brush *brush);
if ((p)->runtime.ob_mode == OB_MODE_SCULPT) { \
BKE_brush_builtin_patch(brush, tool); \
if (_old != tool) { \
- BKE_brush_sculpt_reset(brush, tool); \
+ BKE_brush_sculpt_reset(brush); \
} \
} \
} \
diff --git a/source/blender/blenkernel/intern/brush_channel_define.h b/source/blender/blenkernel/intern/brush_channel_define.h
index c46d149db25..b44a04ca44c 100644
--- a/source/blender/blenkernel/intern/brush_channel_define.h
+++ b/source/blender/blenkernel/intern/brush_channel_define.h
@@ -273,7 +273,7 @@ places in rna_engine_codebase are relevent:
{-1}
})
MAKE_FLOAT(normal_radius_factor, "Normal Radius", "Ratio between the brush radius and the radius that is going to be "
- "used to sample the normal", 0.5f, 0.0f, 1.0f)
+ "used to sample the normal", 0.5f, 0.0f, 2.0f)
MAKE_FLOAT(hardness, "Hardness", "Brush falloff hardness", 0.0f, 0.0f, 1.0f)
MAKE_FLOAT(tip_roundness, "Tip Roundness", "", 1.0f, 0.0f, 1.0f)
MAKE_BOOL(accumulate, "Accumulate", "", false)
More information about the Bf-blender-cvs
mailing list