kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton 2013-10-09 21:19:25 +00:00
parent 0a862cb61a
commit ea8b44cc15
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/pbvh_bmesh.c
View File

@ -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);
}

2
source/blender/imbuf/intern/filetype.c
View File

@ -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)
{

2
source/blender/imbuf/intern/oiio/openimageio_api.cpp
View File

@ -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
*/

6
source/blender/imbuf/intern/oiio/openimageio_api.h
View File

@ -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__ */

2
source/blender/windowmanager/intern/wm_files.c
View File

@ -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));
}