[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56344] trunk/blender/source/blender: quiet warning, color blend c file was missing own include, also minor style tweaks.

[Campbell Barton]

Revision: 56344
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56344
Author:   campbellbarton
Date:     2013-04-27 17:41:10 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
quiet warning, color blend c file was missing own include, also minor style tweaks.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/displist.c
    trunk/blender/source/blender/blenlib/BLI_math_color_blend.h
    trunk/blender/source/blender/blenlib/intern/math_color_blend_inline.c

Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c	2013-04-27 17:08:37 UTC (rev 56343)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c	2013-04-27 17:41:10 UTC (rev 56344)
@@ -651,7 +651,7 @@
 	}
 	else {
 		/* TODO, investigate passing zup instead of NULL */
-		BKE_displist_fill(dispbase, dispbase, NULL,0);
+		BKE_displist_fill(dispbase, dispbase, NULL, false);
 	}
 }
 

Modified: trunk/blender/source/blender/blenlib/BLI_math_color_blend.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_color_blend.h	2013-04-27 17:08:37 UTC (rev 56343)
+++ trunk/blender/source/blender/blenlib/BLI_math_color_blend.h	2013-04-27 17:41:10 UTC (rev 56344)
@@ -26,7 +26,7 @@
 #ifndef __BLI_MATH_COLOR_BLEND_H__
 #define __BLI_MATH_COLOR_BLEND_H__
 
-/** \file BLI_math_color.h
+/** \file BLI_math_color_blend.h
  *  \ingroup bli
  */
 

Modified: trunk/blender/source/blender/blenlib/intern/math_color_blend_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_color_blend_inline.c	2013-04-27 17:08:37 UTC (rev 56343)
+++ trunk/blender/source/blender/blenlib/intern/math_color_blend_inline.c	2013-04-27 17:41:10 UTC (rev 56344)
@@ -23,13 +23,13 @@
  * ***** END GPL LICENSE BLOCK *****
  * */
 
-/** \file blender/blenlib/intern/math_color_inline.c
+/** \file blender/blenlib/intern/math_color_blend_inline.c
  *  \ingroup bli
  */
 
-
 #include "BLI_math_base.h"
 #include "BLI_math_color.h"
+#include "BLI_math_color_blend.h"
 #include "BLI_utildefines.h"
 
 #ifndef __MATH_COLOR_BLEND_INLINE_C__
@@ -329,7 +329,7 @@
 		 * src1 and src2, then blend it with src1 */
 		const float t = src2[3];
 		const float mt = 1.0f - t;
-		const float map_alpha = src1[3]/src2[3];
+		const float map_alpha = src1[3] / src2[3];
 
 		dst[0] = mt * src1[0] + t * max_ff(src1[0], src2[0] * map_alpha);
 		dst[1] = mt * src1[1] + t * max_ff(src1[1], src2[1] * map_alpha);
@@ -373,7 +373,7 @@
 	if (src2[3] != 0.0f && src1[3] > 0.0f) {
 		/* subtract alpha and remap RGB channels to match */
 		const float alpha = max_ff(src1[3] - src2[3], 0.0f);
-		const float map_alpha = alpha/src1[3];
+		const float map_alpha = alpha / src1[3];
 
 		dst[0] *= map_alpha;
 		dst[1] *= map_alpha;
@@ -394,7 +394,7 @@
 	if (src2[3] != 0.0f && src1[3] < 1.0f) {
 		/* add alpha and remap RGB channels to match */
 		const float alpha = min_ff(src1[3] + src2[3], 1.0f);
-		const float map_alpha = (src1[3] > 0.0f) ? alpha/src1[3] : 1.0f;
+		const float map_alpha = (src1[3] > 0.0f) ? alpha / src1[3] : 1.0f;
 
 		dst[0] *= map_alpha;
 		dst[1] *= map_alpha;