style cleanup:

also rename mesh_getVertexCos() --> BKE_mesh_vertexCos_get() to match curve function.

3 files changed, 23 insertions, 23 deletions

diff --git a/source/blender/imbuf/intern/dds/BlockDXT.cpp b/source/blender/imbuf/intern/dds/BlockDXT.cpp
index 348e1e9f53a..8e571483e08 100644
--- a/source/blender/imbuf/intern/dds/BlockDXT.cpp
+++ b/source/blender/imbuf/intern/dds/BlockDXT.cpp
@@ -220,7 +220,7 @@ void BlockDXT1::evaluatePalette4(Color32 color_array[4]) const
 }
 
 
-void BlockDXT1::decodeBlock(ColorBlock * block) const
+void BlockDXT1::decodeBlock(ColorBlock *block) const
 {
 	// Decode color block.
 	Color32 color_array[4];
@@ -235,7 +235,7 @@ void BlockDXT1::decodeBlock(ColorBlock * block) const
 	}
 }
 
-void BlockDXT1::decodeBlockNV5x(ColorBlock * block) const
+void BlockDXT1::decodeBlockNV5x(ColorBlock *block) const
 {
 	// Decode color block.
 	Color32 color_array[4];
@@ -277,7 +277,7 @@ inline void BlockDXT1::flip2()
 	BlockDXT3
 ----------------------------------------------------------------------------*/
 
-void BlockDXT3::decodeBlock(ColorBlock * block) const
+void BlockDXT3::decodeBlock(ColorBlock *block) const
 {
 	// Decode color.
 	color.decodeBlock(block);
@@ -286,13 +286,13 @@ void BlockDXT3::decodeBlock(ColorBlock * block) const
 	alpha.decodeBlock(block);
 }
 
-void BlockDXT3::decodeBlockNV5x(ColorBlock * block) const
+void BlockDXT3::decodeBlockNV5x(ColorBlock *block) const
 {
 	color.decodeBlockNV5x(block);
 	alpha.decodeBlock(block);
 }
 
-void AlphaBlockDXT3::decodeBlock(ColorBlock * block) const
+void AlphaBlockDXT3::decodeBlock(ColorBlock *block) const
 {
 	block->color(0x0).a = (alpha0 << 4) | alpha0;
 	block->color(0x1).a = (alpha1 << 4) | alpha1;
@@ -415,7 +415,7 @@ void AlphaBlockDXT5::setIndex(uint index, uint value)
 	this->u = (this->u & ~mask) | (uint64(value) << offset);
 }
 
-void AlphaBlockDXT5::decodeBlock(ColorBlock * block) const
+void AlphaBlockDXT5::decodeBlock(ColorBlock *block) const
 {
 	uint8 alpha_array[8];
 	evaluatePalette(alpha_array);
@@ -454,7 +454,7 @@ void AlphaBlockDXT5::flip2()
 	*b = tmp;
 }
 
-void BlockDXT5::decodeBlock(ColorBlock * block) const
+void BlockDXT5::decodeBlock(ColorBlock *block) const
 {
 	// Decode color.
 	color.decodeBlock(block);
@@ -463,7 +463,7 @@ void BlockDXT5::decodeBlock(ColorBlock * block) const
 	alpha.decodeBlock(block);
 }
 
-void BlockDXT5::decodeBlockNV5x(ColorBlock * block) const
+void BlockDXT5::decodeBlockNV5x(ColorBlock *block) const
 {
 	// Decode color.
 	color.decodeBlockNV5x(block);
@@ -488,7 +488,7 @@ void BlockDXT5::flip2()
 
 
 /// Decode ATI1 block.
-void BlockATI1::decodeBlock(ColorBlock * block) const
+void BlockATI1::decodeBlock(ColorBlock *block) const
 {
 	uint8 alpha_array[8];
 	alpha.evaluatePalette(alpha_array);
@@ -517,7 +517,7 @@ void BlockATI1::flip2()
 
 
 /// Decode ATI2 block.
-void BlockATI2::decodeBlock(ColorBlock * block) const
+void BlockATI2::decodeBlock(ColorBlock *block) const
 {
 	uint8 alpha_array[8];
 	uint8 index_array[16];
@@ -580,7 +580,7 @@ void BlockCTX1::evaluatePalette(Color32 color_array[4]) const
 	color_array[3].a = 0xFF;
 }
 
-void BlockCTX1::decodeBlock(ColorBlock * block) const
+void BlockCTX1::decodeBlock(ColorBlock *block) const
 {
 	// Decode color block.
 	Color32 color_array[4];
diff --git a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp
index dbd87bf1426..28f31fcad8b 100644
--- a/source/blender/imbuf/intern/dds/ColorBlock.cpp
+++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp
@@ -57,7 +57,7 @@ ColorBlock::ColorBlock()
 }
 
 /// Init the color block from an array of colors.
-ColorBlock::ColorBlock(const uint * linearImage)
+ColorBlock::ColorBlock(const uint *linearImage)
 {
 	for (uint i = 0; i < 16; i++) {
 		color(i) = Color32(linearImage[i]);
@@ -74,17 +74,17 @@ ColorBlock::ColorBlock(const ColorBlock & block)
 
 
 /// Initialize this color block.
-ColorBlock::ColorBlock(const Image * img, uint x, uint y)
+ColorBlock::ColorBlock(const Image *img, uint x, uint y)
 {
 	init(img, x, y);
 }
 
-void ColorBlock::init(const Image * img, uint x, uint y)
+void ColorBlock::init(const Image *img, uint x, uint y)
 {
 	init(img->width(), img->height(), (const uint *)img->pixels(), x, y);
 }
 
-void ColorBlock::init(uint w, uint h, const uint * data, uint x, uint y)
+void ColorBlock::init(uint w, uint h, const uint *data, uint x, uint y)
 {
 	const uint bw = min(w - x, 4U);
 	const uint bh = min(h - y, 4U);
@@ -105,7 +105,7 @@ void ColorBlock::init(uint w, uint h, const uint * data, uint x, uint y)
 	}
 }
 
-void ColorBlock::init(uint w, uint h, const float * data, uint x, uint y)
+void ColorBlock::init(uint w, uint h, const float *data, uint x, uint y)
 {
 	const uint bw = min(w - x, 4U);
 	const uint bh = min(h - y, 4U);
@@ -245,7 +245,7 @@ bool ColorBlock::hasAlpha() const
 #if 0
 
 /// Get diameter color range.
-void ColorBlock::diameterRange(Color32 * start, Color32 * end) const
+void ColorBlock::diameterRange(Color32 *start, Color32 *end) const
 {
 	Color32 c0, c1;
 	uint best_dist = 0;
@@ -266,7 +266,7 @@ void ColorBlock::diameterRange(Color32 * start, Color32 * end) const
 }
 
 /// Get luminance color range.
-void ColorBlock::luminanceRange(Color32 * start, Color32 * end) const
+void ColorBlock::luminanceRange(Color32 *start, Color32 *end) const
 {
 	Color32 minColor, maxColor;
 	uint minLuminance, maxLuminance;
@@ -292,7 +292,7 @@ void ColorBlock::luminanceRange(Color32 * start, Color32 * end) const
 }
 
 /// Get color range based on the bounding box. 
-void ColorBlock::boundsRange(Color32 * start, Color32 * end) const
+void ColorBlock::boundsRange(Color32 *start, Color32 *end) const
 {
 	Color32 minColor(255, 255, 255);
 	Color32 maxColor(0, 0, 0);
@@ -326,7 +326,7 @@ void ColorBlock::boundsRange(Color32 * start, Color32 * end) const
 }
 
 /// Get color range based on the bounding box. 
-void ColorBlock::boundsRangeAlpha(Color32 * start, Color32 * end) const
+void ColorBlock::boundsRangeAlpha(Color32 *start, Color32 *end) const
 {
 	Color32 minColor(255, 255, 255, 255);
 	Color32 maxColor(0, 0, 0, 0);
@@ -387,7 +387,7 @@ void ColorBlock::sortColorsByAbsoluteValue()
 
 
 /*/// Find extreme colors in the given axis.
-void ColorBlock::computeRange(Vector3::Arg axis, Color32 * start, Color32 * end) const
+void ColorBlock::computeRange(Vector3::Arg axis, Color32 *start, Color32 *end) const
 {
 	
 	int mini, maxi;
diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp
index 0c240f16227..a6d53ffac96 100644
--- a/source/blender/imbuf/intern/dds/dds_api.cpp
+++ b/source/blender/imbuf/intern/dds/dds_api.cpp
@@ -47,7 +47,7 @@ extern "C" {
 #include "IMB_colormanagement.h"
 #include "IMB_colormanagement_intern.h"
 
-int imb_save_dds(struct ImBuf * ibuf, const char *name, int flags)
+int imb_save_dds(struct ImBuf *ibuf, const char *name, int flags)
 {
 	return(0); /* todo: finish this function */
 
@@ -85,7 +85,7 @@ int imb_is_a_dds(unsigned char *mem) // note: use at most first 32 bytes
 
 struct ImBuf *imb_load_dds(unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE])
 {
-	struct ImBuf * ibuf = 0;
+	struct ImBuf *ibuf = NULL;
 	DirectDrawSurface dds(mem, size); /* reads header */
 	unsigned char bits_per_pixel;
 	unsigned int *rect;