[Bf-blender-cvs] [cef3792] master: Cleanup: style

Campbell Barton noreply at git.blender.org
Thu Mar 12 14:08:15 CET 2015


Commit: cef379242bf2e30522f7b73dcc13c79f45b4e9ef
Author: Campbell Barton
Date:   Fri Mar 13 00:07:26 2015 +1100
Branches: master
https://developer.blender.org/rBcef379242bf2e30522f7b73dcc13c79f45b4e9ef

Cleanup: style

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

M	source/blender/compositor/intern/COM_MemoryBuffer.h
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h
index 322e4bc..0b5fc21 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.h
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.h
@@ -222,7 +222,7 @@ public:
 			int v = y;
 			this->wrap_pixel(u, v, extend_x, extend_y);
 			const int offset = (this->m_width * y + x) * this->m_num_channels;
-			float* buffer = &this->m_buffer[offset];
+			float *buffer = &this->m_buffer[offset];
 			memcpy(result, buffer, sizeof(float) * this->m_num_channels);
 		}
 	}
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index a41214a..3e7ffcd 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -954,12 +954,13 @@ PropertyRNA *UNUSED(prop), bool *r_free)
 	EnumPropertyItem *item = NULL;
 	int i = 1, totitem = 0;
 
-	if(imf->depth == 16)
+	if (imf->depth == 16)
 		return exr_codec_items; /* All compression types are defined for halfs */
 
 	for (i = 0; i < R_IMF_EXR_CODEC_MAX; i++) {
-		if((i == R_IMF_EXR_CODEC_B44 || i == R_IMF_EXR_CODEC_B44A))
+		if ((i == R_IMF_EXR_CODEC_B44 || i == R_IMF_EXR_CODEC_B44A)) {
 			continue; /* B44 and B44A are not defined for 32 bit floats */
+		}
 
 		RNA_enum_item_add(&item, &totitem, &exr_codec_items[i]);
 	}




More information about the Bf-blender-cvs mailing list