bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton 2017-12-04 16:37:31 +11:00
parent e1eb1fbfca
commit d47d263b4b
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -760,7 +760,7 @@ if(WITH_INTERNATIONAL)
endif()
if(WITH_PYTHON)
# While we have this as an '#error' in bpy_util.h,
# While we have this as an '#error' in 'bpy_capi_utils.h',
# upgrading Python tends to cause confusion for users who build.
# Give the error message early to make this more obvious.
#

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

@ -1507,7 +1507,7 @@ static void init_colormix_effect(Sequence *seq)
{
ColorMixVars *data;
if (seq->effectdata){
if (seq->effectdata) {
MEM_freeN(seq->effectdata);
}
seq->effectdata = MEM_callocN(sizeof(ColorMixVars), "colormixvars");

8
source/blender/bmesh/intern/bmesh_marking.c
View File

@ -254,8 +254,8 @@ void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode)
/* both loops only set edge/face flags and read off verts */
BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
!BM_elem_flag_test(e, BM_ELEM_HIDDEN))
BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
!BM_elem_flag_test(e, BM_ELEM_HIDDEN))
{
BM_elem_flag_enable(e, BM_ELEM_SELECT);
}
@ -366,8 +366,8 @@ void BM_mesh_select_flush(BMesh *bm)
BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
!BM_elem_flag_test(e, BM_ELEM_HIDDEN))
BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
!BM_elem_flag_test(e, BM_ELEM_HIDDEN))
{
BM_elem_flag_enable(e, BM_ELEM_SELECT);
}

2
source/blender/bmesh/operators/bmo_rotate_edges.c
View File

@ -18,7 +18,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
/** \file blender/bmesh/operators/bmo_rotate_edge.c
/** \file blender/bmesh/operators/bmo_rotate_edges.c
* \ingroup bmesh
*
* Rotate edges topology that share two faces.

6
source/blender/python/intern/bpy_capi_utils.h
View File

@ -24,8 +24,8 @@
* \ingroup pythonintern
*/
#ifndef __BPY_UTIL_H__
#define __BPY_UTIL_H__
#ifndef __BPY_CAPI_UTILS_H__
#define __BPY_CAPI_UTILS_H__
#if PY_VERSION_HEX < 0x03060000
# error "Python 3.6 or greater is required, you'll need to update your python."
@ -50,4 +50,4 @@ void BPy_SetContext(struct bContext *C);
extern void bpy_context_set(struct bContext *C, PyGILState_STATE *gilstate);
extern void bpy_context_clear(struct bContext *C, PyGILState_STATE *gilstate);
#endif /* __BPY_UTIL_H__ */
#endif /* __BPY_CAPI_UTILS_H__ */