diff options
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh_bmesh.c | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/filetype.c | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/oiio/openimageio_api.cpp | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/oiio/openimageio_api.h | 6 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index 98f2f7bcf24..deb77d14988 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -692,7 +692,7 @@ static void pbvh_bmesh_split_edge(EdgeQueueContext *eq_ctx, PBVH *bvh, if (cd_vert_mask_offset != -1) { float mask_v1 = BM_ELEM_CD_GET_FLOAT(e->v1, cd_vert_mask_offset); float mask_v2 = BM_ELEM_CD_GET_FLOAT(e->v2, cd_vert_mask_offset); - float mask_v_new = 0.5f*(mask_v1 + mask_v2); + float mask_v_new = 0.5f * (mask_v1 + mask_v2); BM_ELEM_CD_SET_FLOAT(v_new, cd_vert_mask_offset, mask_v_new); } diff --git a/source/blender/imbuf/intern/filetype.c b/source/blender/imbuf/intern/filetype.c index c947a3b05e2..bd642769605 100644 --- a/source/blender/imbuf/intern/filetype.c +++ b/source/blender/imbuf/intern/filetype.c @@ -108,7 +108,7 @@ ImFileType IMB_FILE_TYPES[] = { {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0} }; -ImFileType *IMB_FILE_TYPES_LAST = &IMB_FILE_TYPES[sizeof(IMB_FILE_TYPES)/sizeof(ImFileType)-1]; +ImFileType *IMB_FILE_TYPES_LAST = &IMB_FILE_TYPES[sizeof(IMB_FILE_TYPES) / sizeof(ImFileType) - 1]; void imb_filetypes_init(void) { diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index 9891079e7aa..838343dce35 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/imbuf/intern/oiio/openimageio_api.h +/** \file blender/imbuf/intern/oiio/openimageio_api.cpp * \ingroup openimageio */ diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.h b/source/blender/imbuf/intern/oiio/openimageio_api.h index ce96e277f7f..ad11f4bcfe3 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.h +++ b/source/blender/imbuf/intern/oiio/openimageio_api.h @@ -30,8 +30,8 @@ */ -#ifndef __OIIO_API_H__ -#define __OIIO_API_H__ +#ifndef __OPENIMAGEIO_API_H__ +#define __OPENIMAGEIO_API_H__ #ifdef __cplusplus extern "C" { @@ -50,4 +50,4 @@ struct ImBuf *imb_load_photoshop (const char *name, int flags, char *colorspace) #endif -#endif /* __OIIO_API_H */ +#endif /* __OPENIMAGEIO_API_H__ */ diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index c9c45f888de..f7bbb84facc 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -865,7 +865,7 @@ int wm_file_write(bContext *C, const char *filepath, int fileflags, ReportList * /* first time saving */ /* XXX temp solution to solve bug, real fix coming (ton) */ - if ((G.main->name[0] == '\0' && !(fileflags & G_FILE_SAVE_COPY))) { + if ((G.main->name[0] == '\0') && !(fileflags & G_FILE_SAVE_COPY)) { BLI_strncpy(G.main->name, filepath, sizeof(G.main->name)); } |