Merged changes in the trunk up to revision 45133.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.c b/source/blender/imbuf/intern/cineon/cineon_dpx.c
index af964bb2bb3..c1222d3cea3 100644
--- a/source/blender/imbuf/intern/cineon/cineon_dpx.c
+++ b/source/blender/imbuf/intern/cineon/cineon_dpx.c
@@ -154,7 +154,7 @@ static int imb_save_dpx_cineon(ImBuf *ibuf, const char *filename, int use_cineon
 
 	if (!logImage) return 0;
 	
-	if(logImageSetByteConversion(logImage, &conversion)==0) {
+	if (logImageSetByteConversion(logImage, &conversion)==0) {
 		printf("error setting args\n");
 	}
 
@@ -184,7 +184,7 @@ static int imb_save_dpx_cineon(ImBuf *ibuf, const char *filename, int use_cineon
 
 	MEM_freeN(line);
 	
-	if(is_alloc) {
+	if (is_alloc) {
 		MEM_freeN(fbuf);
 	}
 	
@@ -204,7 +204,7 @@ int imb_is_cineon(unsigned char *buf)
 
 ImBuf *imb_loadcineon(unsigned char *mem, size_t size, int flags)
 {
-	if(imb_is_cineon(mem))
+	if (imb_is_cineon(mem))
 		return imb_load_dpx_cineon(mem, 1, size, flags);
 	return NULL;
 }
@@ -221,7 +221,7 @@ int imb_is_dpx(unsigned char *buf)
 
 ImBuf *imb_loaddpx(unsigned char *mem, size_t size, int flags)
 {
-	if(imb_is_dpx(mem))
+	if (imb_is_dpx(mem))
 		return imb_load_dpx_cineon(mem, 0, size, flags);
 	return NULL;
 }