archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2015-01-02 19:18:57 +11:00
parent bf169d6ca6
commit 4abe548527
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/bvh/bvh.cpp
View File

@@ -898,7 +898,7 @@ void QBVH::refit_node(int idx, bool leaf, BoundBox& bbox, uint& visibility)
* no idea about BVHNode. * no idea about BVHNode.
* *
* Would be nice to de-duplicate code, but trying to make * Would be nice to de-duplicate code, but trying to make
* making code more geenral ends up in much nastier code * making code more general ends up in much nastier code
* in my opinion so far. * in my opinion so far.
* *
* Same applies to the inner nodes case below. * Same applies to the inner nodes case below.

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

@@ -533,7 +533,7 @@ void paint_calculate_rake_rotation(UnifiedPaintSettings *ups, Brush *brush, cons
} }
} }
else { else {
ups->brush_rotation = ups->brush_rotation_sec =0.0f; ups->brush_rotation = ups->brush_rotation_sec = 0.0f;
} }
} }

10
source/blender/blenlib/intern/winstuff_dir.c
View File

@@ -45,11 +45,11 @@
#include "utfconv.h" #include "utfconv.h"
/* Note: MinGW (FREE_WINDOWS) has opendir() and _wopendir(), and only the /* Note: MinGW (FREE_WINDOWS) has opendir() and _wopendir(), and only the
* latter accepts a path name of wchar_t type. Rather than messing up with * latter accepts a path name of wchar_t type. Rather than messing up with
* extra #ifdef's here and there, Blender's own implementations of opendir() * extra #ifdef's here and there, Blender's own implementations of opendir()
* and related functions are used to properly support paths with non-ASCII * and related functions are used to properly support paths with non-ASCII
* characters. (kjym3) * characters. (kjym3)
*/ */
DIR *opendir(const char *path) DIR *opendir(const char *path)
{ {

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

@@ -247,7 +247,7 @@ void bmo_similar_faces_exec(BMesh *bm, BMOperator *op)
break; break;
case SIMFACE_SMOOTH: case SIMFACE_SMOOTH:
if(BM_elem_flag_test(fm, BM_ELEM_SMOOTH) == BM_elem_flag_test(fs, BM_ELEM_SMOOTH)) { if (BM_elem_flag_test(fm, BM_ELEM_SMOOTH) == BM_elem_flag_test(fs, BM_ELEM_SMOOTH)) {
BMO_elem_flag_enable(bm, fm, FACE_MARK); BMO_elem_flag_enable(bm, fm, FACE_MARK);
cont = false; cont = false;
} }

6
source/blender/editors/sculpt_paint/paint_image_proj.c
View File

@@ -187,7 +187,7 @@ typedef struct ProjPaintImage {
ImagePaintPartialRedraw *partRedrawRect; ImagePaintPartialRedraw *partRedrawRect;
volatile void **undoRect; /* only used to build undo tiles during painting */ volatile void **undoRect; /* only used to build undo tiles during painting */
unsigned short **maskRect; /* the mask accumulation must happen on canvas, not on space screen bucket. unsigned short **maskRect; /* the mask accumulation must happen on canvas, not on space screen bucket.
* Here we store the mask rectangle */ * Here we store the mask rectangle */
bool **valid; /* store flag to enforce validation of undo rectangle */ bool **valid; /* store flag to enforce validation of undo rectangle */
int touch; int touch;
} ProjPaintImage; } ProjPaintImage;
@@ -2496,10 +2496,10 @@ static void project_paint_face_init(const ProjPaintState *ps, const int thread_i
CLAMP(bounds_px.ymax, 0, ibuf->y); CLAMP(bounds_px.ymax, 0, ibuf->y);
} }
/* #if 0
project_paint_undo_tiles_init(&bounds_px, ps->projImages + image_index, tmpibuf, project_paint_undo_tiles_init(&bounds_px, ps->projImages + image_index, tmpibuf,
tile_width, threaded, ps->do_masking); tile_width, threaded, ps->do_masking);
*/ #endif
/* clip face and */ /* clip face and */
has_isect = 0; has_isect = 0;

2
source/blender/editors/util/ed_util.c
View File

@@ -174,7 +174,7 @@ bool ED_editors_flush_edits(const bContext *C, bool for_render)
} }
else { else {
/* Set reorder=false so that saving the file doesn't reorder /* Set reorder=false so that saving the file doesn't reorder
* the BMesh's elements */ * the BMesh's elements */
BKE_sculptsession_bm_to_me(ob, false); BKE_sculptsession_bm_to_me(ob, false);
} }
} }

6
source/blender/python/mathutils/mathutils_geometry.c
View File

@@ -787,7 +787,7 @@ static PyObject *M_Geometry_intersect_point_tri(PyObject *UNUSED(self), PyObject
if (!PyArg_ParseTuple( if (!PyArg_ParseTuple(
args, "OOOO:intersect_point_tri", args, "OOOO:intersect_point_tri",
&py_pt, UNPACK3_EX(&, py_tri,))) &py_pt, UNPACK3_EX(&, py_tri, )))
{ {
return NULL; return NULL;
} }
@@ -833,7 +833,7 @@ static PyObject *M_Geometry_intersect_point_tri_2d(PyObject *UNUSED(self), PyObj
if (!PyArg_ParseTuple( if (!PyArg_ParseTuple(
args, "OOOO:intersect_point_tri_2d", args, "OOOO:intersect_point_tri_2d",
&py_pt, UNPACK3_EX(&, py_tri,))) &py_pt, UNPACK3_EX(&, py_tri, )))
{ {
return NULL; return NULL;
} }
@@ -878,7 +878,7 @@ static PyObject *M_Geometry_intersect_point_quad_2d(PyObject *UNUSED(self), PyOb
if (!PyArg_ParseTuple( if (!PyArg_ParseTuple(
args, "OOOOO:intersect_point_quad_2d", args, "OOOOO:intersect_point_quad_2d",
&py_pt, UNPACK4_EX(&, py_quad,))) &py_pt, UNPACK4_EX(&, py_quad, )))
{ {
return NULL; return NULL;
} }