[Bf-blender-cvs] [697b7a3] PSketch: PSculpt: Reduce the strength of the curl and twist brushes

Joshua Leung noreply at git.blender.org
Sun Jan 31 14:28:43 CET 2016


Commit: 697b7a35e2bd83f4ae22d4f065cbd9532caeb468
Author: Joshua Leung
Date:   Sun Nov 22 20:22:07 2015 +1300
Branches: PSketch
https://developer.blender.org/rB697b7a35e2bd83f4ae22d4f065cbd9532caeb468

PSculpt: Reduce the strength of the curl and twist brushes

>From previous feedback, the curl and twist brushes were far too strong,
making them hard to use whe ntrying to do careful posing work. This commit
removes the x10 boosting factor that was being used to make these get applied
at a "reasonable" speed; while this was a good idea for demos, it was quite
bad for actual posing work.

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

M	source/blender/editors/armature/pose_sculpt.c

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

diff --git a/source/blender/editors/armature/pose_sculpt.c b/source/blender/editors/armature/pose_sculpt.c
index 2ad4513..ee1e178 100644
--- a/source/blender/editors/armature/pose_sculpt.c
+++ b/source/blender/editors/armature/pose_sculpt.c
@@ -632,12 +632,13 @@ static void brush_curl(tPoseSculptingOp *pso, tPSculptContext *data, bPoseChanne
 	if (get_pchan_eul_rotation(eul, NULL, pchan) == false)
 		return;
 	
-	/* amount to rotate depends on the strength of the brush 
-	 * - 10.0f factor is used to get values of ~x.y degrees vs 0.xy degrees
-	 * - rotations are internally represented using radians, which are very sensitive
+	/* Amount to rotate depends on the strength of the brush 
+	 * - The current calculation results in 0.xy degree values. Multiplying by even 2.5
+	 *   however is much too strong for controllability. So, leaving it as-is.
+	 * - Rotations are internally represented using radians, which are very sensitive
 	 */
-	angle = fabsf(1.0f - data->dist / data->rad) * data->fac * 10.0f;	//printf("%f ", angle);
-	angle = DEG2RAD(angle);                                             //printf("%f \n", angle);
+	angle = fabsf(1.0f - data->dist / data->rad) * data->fac;	//printf("%f ", angle);
+	angle = DEG2RAD(angle);                                     //printf("%f \n", angle);
 	
 	if (data->invert) angle = -angle;
 	
@@ -672,12 +673,13 @@ static void brush_twist(tPoseSculptingOp *pso, tPSculptContext *data, bPoseChann
 	if (get_pchan_eul_rotation(eul, NULL, pchan) == false)
 		return;
 	
-	/* amount to rotate depends on the strength of the brush 
-	 * - 10.0f factor is used to get values of ~x.y degrees vs 0.xy degrees
-	 * - rotations are internally represented using radians, which are very sensitive
+	/* Amount to rotate depends on the strength of the brush 
+	 * - The current calculation results in 0.xy degree values. Multiplying by even 2.5
+	 *   however is much too strong for controllability. So, leaving it as-is.
+	 * - Rotations are internally represented using radians, which are very sensitive
 	 */
-	angle = fabsf(1.0f - data->dist / data->rad) * data->fac * 10.0f;	//printf("%f ", angle);
-	angle = DEG2RAD(angle);                                             //printf("%f \n", angle);
+	angle = fabsf(1.0f - data->dist / data->rad) * data->fac;	//printf("%f ", angle);
+	angle = DEG2RAD(angle);                                     //printf("%f \n", angle);
 	
 	if (data->invert) angle = -angle;




More information about the Bf-blender-cvs mailing list