[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60516] trunk/blender/source/blender/ editors/sculpt_paint/sculpt.c: adjustments to sculpt cache scaling code, ( float/double promotion)

Campbell Barton ideasman42 at gmail.com
Thu Oct 3 05:05:42 CEST 2013


Revision: 60516
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60516
Author:   campbellbarton
Date:     2013-10-03 03:05:41 +0000 (Thu, 03 Oct 2013)
Log Message:
-----------
adjustments to sculpt cache scaling code, (float/double promotion)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/sculpt.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2013-10-02 22:46:26 UTC (rev 60515)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2013-10-03 03:05:41 UTC (rev 60516)
@@ -3795,30 +3795,27 @@
 	Object *ob = CTX_data_active_object(C);
 	float mat[3][3];
 	float viewDir[3] = {0.0f, 0.0f, 1.0f};
+	float max_scale;
 	int i;
 	int mode;
 
 	ss->cache = cache;
 
 	/* Set scaling adjustment */
-
 	if (brush->sculpt_tool == SCULPT_TOOL_LAYER) {
-		cache->scale[0] = 1.0f / ob->size[0];
-		cache->scale[1] = 1.0f / ob->size[1];
-		cache->scale[2] = 1.0f / ob->size[2];
+		max_scale = 1.0f;
 	}
 	else {
-		float max_scale = 0.0f;
-
+		max_scale = 0.0f;
 		for (i = 0; i < 3; i ++) {
-			if (fabs(ob->size[i]) > max_scale)
-				max_scale = fabs(ob->size[i]);
+			max_scale = max_ff(max_scale, fabsf(ob->size[i]));
 		}
-
-		cache->scale[0] = max_scale / ob->size[0];
-		cache->scale[1] = max_scale / ob->size[1];
-		cache->scale[2] = max_scale / ob->size[2];
 	}
+	cache->scale[0] = max_scale / ob->size[0];
+	cache->scale[1] = max_scale / ob->size[1];
+	cache->scale[2] = max_scale / ob->size[2];
+
+
 	cache->plane_trim_squared = brush->plane_trim * brush->plane_trim;
 
 	cache->flag = 0;




More information about the Bf-blender-cvs mailing list