Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-12-20 14:43:42 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-12-20 14:52:08 +0400
commitf55eba54627359b8da6008a3bd6d5a8ca05fe977 (patch)
treeac0589d8daa0472d9da8b0d128a45ff266729f84
parent39daf283ae260b6cd8b85e4b269959c421010268 (diff)
Code Cleanup: style
-rw-r--r--source/blender/blenkernel/intern/object.c2
-rw-r--r--source/blender/editors/sculpt_paint/paint_mask.c14
-rw-r--r--source/blender/editors/sculpt_paint/sculpt.c3
-rw-r--r--source/blender/editors/space_view3d/drawvolume.c8
4 files changed, 14 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index a3b0dfc1dfd..8657e3b0ebf 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1097,7 +1097,7 @@ static LodLevel *lod_level_select(Object *ob, const float cam_loc[3])
sub_v3_v3v3(delta, ob_loc, cam_loc);
distance2 = len_squared_v3(delta);
- if (distance2 < current->distance*current->distance) {
+ if (distance2 < current->distance * current->distance) {
/* check for higher LoD */
while (current->prev && distance2 < (current->distance * current->distance)) {
current = current->prev;
diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c
index acc138afcb8..a116cb59de8 100644
--- a/source/blender/editors/sculpt_paint/paint_mask.c
+++ b/source/blender/editors/sculpt_paint/paint_mask.c
@@ -222,9 +222,9 @@ int do_sculpt_mask_box_select(ViewContext *vc, rcti *rect, bool select, bool UNU
for (symmpass = 0; symmpass <= symm; ++symmpass) {
if (symmpass == 0 ||
- (symm & symmpass &&
- (symm != 5 || symmpass != 3) &&
- (symm != 6 || (symmpass != 3 && symmpass != 5))))
+ (symm & symmpass &&
+ (symm != 5 || symmpass != 3) &&
+ (symm != 6 || (symmpass != 3 && symmpass != 5))))
{
int j = 0;
@@ -365,10 +365,10 @@ static int paint_mask_gesture_lasso_exec(bContext *C, wmOperator *op)
sculpt_undo_push_begin("Mask lasso fill");
for (symmpass = 0; symmpass <= symm; ++symmpass) {
- if (symmpass == 0 ||
- (symm & symmpass &&
- (symm != 5 || symmpass != 3) &&
- (symm != 6 || (symmpass != 3 && symmpass != 5))))
+ if ((symmpass == 0) ||
+ (symm & symmpass &&
+ (symm != 5 || symmpass != 3) &&
+ (symm != 6 || (symmpass != 3 && symmpass != 5))))
{
int j = 0;
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 975aa28166e..884a09a56e3 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -3293,7 +3293,8 @@ static void sculpt_combine_proxies(Sculpt *sd, Object *ob)
/* first line is tools that don't support proxies */
if (!ELEM(brush->sculpt_tool, SCULPT_TOOL_SMOOTH, SCULPT_TOOL_LAYER) ||
- ss->cache->supports_gravity) {
+ ss->cache->supports_gravity)
+ {
/* these brushes start from original coordinates */
const bool use_orco = ELEM3(brush->sculpt_tool, SCULPT_TOOL_GRAB,
SCULPT_TOOL_ROTATE, SCULPT_TOOL_THUMB);
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 6ce38e661a2..eb4493a9d1a 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -473,11 +473,11 @@ void draw_smoke_volume(SmokeDomainSettings *sds, Object *ob,
glColor3f(1.0, 1.0, 1.0);
for (i = 0; i < numpoints; i++) {
glTexCoord3d((points[i][0] - min[0]) * cor[0],
- (points[i][1] - min[1]) * cor[1],
- (points[i][2] - min[2]) * cor[2]);
+ (points[i][1] - min[1]) * cor[1],
+ (points[i][2] - min[2]) * cor[2]);
glVertex3f(points[i][0] * ob_sizei[0],
- points[i][1] * ob_sizei[1],
- points[i][2] * ob_sizei[2]);
+ points[i][1] * ob_sizei[1],
+ points[i][2] * ob_sizei[2]);
}
glEnd();
}