[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52747] trunk/blender: quiet float -> double conversion warnings and do some osl style edits.

[Campbell Barton]

Revision: 52747
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52747
Author:   campbellbarton
Date:     2012-12-03 13:58:08 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
quiet float -> double conversion warnings and do some osl style edits.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/shaders/node_environment_texture.osl
    trunk/blender/intern/cycles/kernel/shaders/node_geometry.osl
    trunk/blender/intern/cycles/kernel/shaders/node_rgb_ramp.osl
    trunk/blender/source/blender/editors/gpencil/editaction_gpencil.c
    trunk/blender/source/blender/editors/mask/mask_editaction.c

Modified: trunk/blender/intern/cycles/kernel/shaders/node_environment_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_environment_texture.osl	2012-12-03 13:28:35 UTC (rev 52746)
+++ trunk/blender/intern/cycles/kernel/shaders/node_environment_texture.osl	2012-12-03 13:58:08 UTC (rev 52747)
@@ -21,8 +21,8 @@
 
 vector environment_texture_direction_to_equirectangular(vector dir)
 {
-	float u = -atan2(dir[1], dir[0])/(2.0*M_PI) + 0.5;
-	float v = atan2(dir[2], hypot(dir[0], dir[1]))/M_PI + 0.5;
+	float u = -atan2(dir[1], dir[0]) / (2.0 * M_PI) + 0.5;
+	float v = atan2(dir[2], hypot(dir[0], dir[1])) / M_PI + 0.5;
 
 	return vector(u, v, 0.0);
 }
@@ -31,8 +31,8 @@
 {
 	dir[1] -= 1.0;
 
-	float div = 2.0*sqrt(max(-0.5*dir[1], 0.0));
-	if(div > 0.0)
+	float div = 2.0 * sqrt(max(-0.5 * dir[1], 0.0));
+	if (div > 0.0)
 		dir /= div;
 
 	float u = 0.5*(dir[0] + 1.0);

Modified: trunk/blender/intern/cycles/kernel/shaders/node_geometry.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_geometry.osl	2012-12-03 13:28:35 UTC (rev 52746)
+++ trunk/blender/intern/cycles/kernel/shaders/node_geometry.osl	2012-12-03 13:58:08 UTC (rev 52747)
@@ -52,9 +52,9 @@
 	/* try to create spherical tangent from generated coordinates */
 	if (getattribute("geom:generated", generated)) {
 		matrix project = matrix(0.0, 1.0, 0.0, 0.0,
-		                  -1.0, 0.0, 0.0, 0.0,
-						  0.0, 0.0, 0.0, 0.0,
-						  0.5, -0.5, 0.0, 1.0);
+		                        -1.0, 0.0, 0.0, 0.0,
+		                        0.0, 0.0, 0.0, 0.0,
+		                        0.5, -0.5, 0.0, 1.0);
 
 		vector T = transform(project, generated);
 		T = transform("object", "world", T);

Modified: trunk/blender/intern/cycles/kernel/shaders/node_rgb_ramp.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_rgb_ramp.osl	2012-12-03 13:28:35 UTC (rev 52746)
+++ trunk/blender/intern/cycles/kernel/shaders/node_rgb_ramp.osl	2012-12-03 13:58:08 UTC (rev 52747)
@@ -31,8 +31,8 @@
 
 	/* clamp int as well in case of NaN */
 	int i = (int)f;
-	if(i < 0) i = 0;
-	if(i >= RAMP_TABLE_SIZE) i = RAMP_TABLE_SIZE-1;
+	if (i < 0) i = 0;
+	if (i >= RAMP_TABLE_SIZE) i = RAMP_TABLE_SIZE - 1;
 	float t = f - (float)i;
 
 	Color = ramp_color[i];

Modified: trunk/blender/source/blender/editors/gpencil/editaction_gpencil.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/editaction_gpencil.c	2012-12-03 13:28:35 UTC (rev 52746)
+++ trunk/blender/source/blender/editors/gpencil/editaction_gpencil.c	2012-12-03 13:58:08 UTC (rev 52747)
@@ -477,7 +477,7 @@
 {
 	float secf = (float)FPS;
 	if (gpf->flag & GP_FRAME_SELECT)
-		gpf->framenum = (int)(floor(gpf->framenum / secf + 0.5f) * secf);
+		gpf->framenum = (int)(floorf(gpf->framenum / secf + 0.5f) * secf);
 	return 0;
 }
 

Modified: trunk/blender/source/blender/editors/mask/mask_editaction.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_editaction.c	2012-12-03 13:28:35 UTC (rev 52746)
+++ trunk/blender/source/blender/editors/mask/mask_editaction.c	2012-12-03 13:58:08 UTC (rev 52747)
@@ -265,7 +265,7 @@
 {
 	float secf = (float)FPS;
 	if (masklay_shape->flag & MASK_SHAPE_SELECT)
-		masklay_shape->frame = (int)(floor(masklay_shape->frame / secf + 0.5f) * secf);
+		masklay_shape->frame = (int)(floorf(masklay_shape->frame / secf + 0.5f) * secf);
 	return 0;
 }