[Bf-blender-cvs] [6c7bca5] hair_immediate_fixes: Fix for brush radius, the Brush.size property is actually the radius and not the diameter.

Lukas Tönne noreply at git.blender.org
Sat Dec 27 11:32:28 CET 2014


Commit: 6c7bca57f328b1bb2164e8add6ab2982462812e4
Author: Lukas Tönne
Date:   Wed Dec 3 16:38:37 2014 +0100
Branches: hair_immediate_fixes
https://developer.blender.org/rB6c7bca57f328b1bb2164e8add6ab2982462812e4

Fix for brush radius, the Brush.size property is actually the radius and
not the diameter.

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

M	source/blender/editors/hair/hair_stroke.c

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

diff --git a/source/blender/editors/hair/hair_stroke.c b/source/blender/editors/hair/hair_stroke.c
index 12eb355..f93e919 100644
--- a/source/blender/editors/hair/hair_stroke.c
+++ b/source/blender/editors/hair/hair_stroke.c
@@ -111,7 +111,9 @@ BLI_INLINE bool test_inside_circle(HairToolData *data, BMVert *v, float radsq, f
 
 BLI_INLINE float factor_vertex(HairToolData *data, BMVert *v)
 {
-	const float rad = BKE_brush_size_get(data->scene, data->settings->brush) * 0.5f;
+	Scene *scene = data->scene;
+	Brush *brush = data->settings->brush;
+	const float rad = BKE_brush_size_get(scene, brush);
 	const float radsq = rad*rad;
 	
 	float dist;




More information about the Bf-blender-cvs mailing list