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

Cleanup: indentation, trailing space

Browse Source
This commit is contained in:
Campbell Barton
2019-02-26 14:31:14 +11:00
parent 1de11c38d4
commit 186bd4d87b
12 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/subdiv_ccg.c
View File

@@ -628,7 +628,8 @@ SubdivCCG *BKE_subdiv_to_ccg(
subdiv_ccg_init_faces(subdiv_ccg);
subdiv_ccg_init_faces_neighborhood(subdiv_ccg);
if (!subdiv_ccg_evaluate_grids(
subdiv_ccg, subdiv, mask_evaluator, material_flags_evaluator)) {
subdiv_ccg, subdiv, mask_evaluator, material_flags_evaluator))
{
BKE_subdiv_ccg_destroy(subdiv_ccg);
BKE_subdiv_stats_end(&subdiv->stats, SUBDIV_STATS_SUBDIV_TO_CCG);
return NULL;

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

@@ -64,4 +64,4 @@ void BKE_subdiv_ccg_material_flags_init_from_mesh(
subdiv_ccg_material_flags_eval;
material_flags_evaluator->free = subdiv_ccg_material_flags_free;
material_flags_evaluator->user_data = data;
}
}

4
source/blender/blenloader/intern/readfile.c
View File

@@ -2135,7 +2135,7 @@ static void *read_struct(FileData *fd, BHead *bh, const char *blockname)
if (bh->len) {
#ifdef USE_BHEAD_READ_ON_DEMAND
BHead *bh_orig = bh;
#endif
#endif
/* switch is based on file dna */
if (bh->SDNAnr && (fd->flags & FD_FLAGS_SWITCH_ENDIAN)) {
@@ -2147,7 +2147,7 @@ static void *read_struct(FileData *fd, BHead *bh, const char *blockname)
return NULL;
}
}
#endif
#endif
switch_endian_structs(fd->filesdna, bh);
}

14
source/blender/draw/engines/gpencil/gpencil_draw_utils.c
View File

@@ -618,9 +618,9 @@ static void gpencil_add_stroke_vertexdata(
tcolor[3] = gps->runtime.tmp_stroke_rgba[3] * opacity;
if ((use_wiremode) &&
((gps->runtime.tmp_stroke_rgba[3] < GPENCIL_ALPHA_OPACITY_THRESH) ||
(((gp_style->flag & GP_STYLE_STROKE_SHOW) == 0))) &&
(gps->runtime.tmp_fill_rgba[3] >= GPENCIL_ALPHA_OPACITY_THRESH))
((gps->runtime.tmp_stroke_rgba[3] < GPENCIL_ALPHA_OPACITY_THRESH) ||
(((gp_style->flag & GP_STYLE_STROKE_SHOW) == 0))) &&
(gps->runtime.tmp_fill_rgba[3] >= GPENCIL_ALPHA_OPACITY_THRESH))
{
interp_v3_v3v3(tcolor, gps->runtime.tmp_fill_rgba, tintcolor, tintcolor[3]);
tcolor[3] = gps->runtime.tmp_fill_rgba[3] * opacity;
@@ -827,7 +827,7 @@ static void gpencil_draw_strokes(
/* fill */
if ((gp_style->flag & GP_STYLE_FILL_SHOW) &&
(!stl->storage->simplify_fill) &&
(stl->storage->shading_type != OB_WIRE) &&
(stl->storage->shading_type != OB_WIRE) &&
((gps->flag & GP_STROKE_NOFILL) == 0))
{
gpencil_add_fill_vertexdata(
@@ -838,7 +838,7 @@ static void gpencil_draw_strokes(
/* No fill strokes, must show stroke always */
if (((gp_style->flag & GP_STYLE_STROKE_SHOW) ||
(gps->flag & GP_STROKE_NOFILL) ||
(stl->storage->shading_type == OB_WIRE)) &&
(stl->storage->shading_type == OB_WIRE)) &&
((gp_style->stroke_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH) ||
(gpl->blend_mode == eGplBlendMode_Normal)))
{
@@ -925,8 +925,8 @@ static void gpencil_draw_onion_strokes(
/* stroke */
gpencil_add_stroke_vertexdata(
cache, ob, gpl, gpf, gps, opacity, tintcolor,
true, custonion,
(stl->storage->shading_type == OB_WIRE));
true, custonion,
(stl->storage->shading_type == OB_WIRE));
stl->storage->shgroup_id++;
}

6
source/blender/draw/engines/gpencil/gpencil_engine.c
View File

@@ -523,7 +523,7 @@ void GPENCIL_cache_init(void *vedata)
/* create effects passes */
if ((!stl->storage->simplify_fx) &&
(stl->storage->shading_type != OB_WIRE))
(stl->storage->shading_type != OB_WIRE))
{
GPENCIL_create_fx_passes(psl);
}
@@ -552,8 +552,8 @@ static void gpencil_add_draw_data(void *vedata, Object *ob)
/* FX passses */
cache_ob->has_fx = false;
if ((!stl->storage->simplify_fx) &&
(stl->storage->shading_type != OB_WIRE) &&
(BKE_shaderfx_has_gpencil(ob)))
(stl->storage->shading_type != OB_WIRE) &&
(BKE_shaderfx_has_gpencil(ob)))
{
cache_ob->has_fx = true;
if ((!stl->storage->simplify_fx) && (!is_multiedit)) {

2
source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
View File

@@ -154,5 +154,5 @@ void main()
else {
gl_FragDepth = 0.000001;
}
}

5
source/blender/editors/screen/screen_ops.c
View File

@@ -964,8 +964,9 @@ static int actionzone_modal(bContext *C, wmOperator *op, const wmEvent *event)
/* Have we dragged off the zone and are not on an edge? */
if ((ED_area_actionzone_find_xy(sad->sa1, &event->x) != sad->az) &&
(screen_geom_area_map_find_active_scredge(
AREAMAP_FROM_SCREEN(sc), &screen_rect, event->x, event->y) == NULL)) {
(screen_geom_area_map_find_active_scredge(
AREAMAP_FROM_SCREEN(sc), &screen_rect, event->x, event->y) == NULL))
{
/* Are we still in same area? */
if (BKE_screen_find_area_xy(sc, SPACE_TYPE_ANY, event->x, event->y) == sad->sa1) {
/* Same area, so possible split. */

2
source/blender/editors/transform/transform_conversions.c
View File

@@ -405,7 +405,7 @@ static void createTransCursor_view3d(TransInfo *t)
td->ob = NULL;
unit_m3(td->mtx);
BKE_scene_cursor_rot_to_mat3(cursor, td->axismtx);
BKE_scene_cursor_rot_to_mat3(cursor, td->axismtx);
normalize_m3(td->axismtx);
pseudoinverse_m3_m3(td->smtx, td->mtx, PSEUDOINVERSE_EPSILON);

2
source/blender/gpu/intern/gpu_buffers.c
View File

@@ -469,7 +469,7 @@ static void gpu_pbvh_grid_fill_index_buffers(
}
GPU_indexbuf_add_line_verts(&elb_lines, v1, v2);
}
if (grid_visible) {
/* Grid corners */
v0 = offset;

2
source/blender/makesdna/intern/dna_utils.h
View File

@@ -21,8 +21,8 @@
#ifndef __DNA_UTILS_H__
#define __DNA_UTILS_H__
struct MemArena;
struct GHash;
struct MemArena;
int DNA_elem_array_size(const char *str);

2
source/blender/makesrna/intern/rna_access.c
View File

@@ -6380,7 +6380,7 @@ static void rna_array_as_string_recursive(
if (totdim > 1) {
totdim--;
const int end = dim_size[totdim] - 1;
for (int i = 0; i <= end; i++){
for (int i = 0; i <= end; i++) {
rna_array_as_string_recursive(type, buf_p, totdim, dim_size, dynstr);
if (i < end || !end) {
BLI_dynstr_append(dynstr, ", ");

50
source/blender/windowmanager/intern/wm_cursors.c
View File

@@ -1248,14 +1248,14 @@ BEGIN_CURSOR_BLOCK
0xE0, 0x03, 0xE0, 0x03, 0xE0, 0x03, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
static char narrow_smsk[] = {
0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0xF0, 0x07,
0xF8, 0x0F, 0xFC, 0x1F, 0xFE, 0x3F, 0xFF, 0x7F,
0xF0, 0x07, 0xF0, 0x07, 0xF0, 0x07, 0xF0, 0x07,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
static char narrow_lbm[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x80, 0x00, 0x00, 0x00, 0xC0, 0x01, 0x00,
@@ -1274,7 +1274,7 @@ BEGIN_CURSOR_BLOCK
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
static char narrow_lmsk[] = {
0x00, 0x80, 0x00, 0x00, 0x00, 0xC0, 0x01, 0x00,
0x00, 0xE0, 0x03, 0x00, 0x00, 0xF0, 0x07, 0x00,
@@ -1293,7 +1293,7 @@ BEGIN_CURSOR_BLOCK
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
static BCursor NArrowCursor = {
/*small*/
narrow_sbm, narrow_smsk,
@@ -1306,7 +1306,7 @@ BEGIN_CURSOR_BLOCK
/*color*/
BC_BLACK, BC_WHITE
};
BlenderCursor[BC_N_ARROWCURSOR] = &NArrowCursor;
END_CURSOR_BLOCK
@@ -1320,14 +1320,14 @@ BEGIN_CURSOR_BLOCK
0xE0, 0x03, 0xFC, 0x1F, 0xF8, 0x0F, 0xF0, 0x07,
0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, 0x00, 0x00
};
static char sarrow_smsk[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0xF0, 0x07, 0xF0, 0x07, 0xF0, 0x07, 0xF0, 0x07,
0xFF, 0x7F, 0xFE, 0x3F, 0xFC, 0x1F, 0xF8, 0x0F,
0xF0, 0x07, 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00
};
static char sarrow_lbm[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1346,7 +1346,7 @@ BEGIN_CURSOR_BLOCK
0x00, 0xC0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
static char sarrow_lmsk[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1365,7 +1365,7 @@ BEGIN_CURSOR_BLOCK
0x00, 0xF0, 0x07, 0x00, 0x00, 0xE0, 0x03, 0x00,
0x00, 0xC0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00
};
static BCursor SArrowCursor = {
/*small*/
sarrow_sbm, sarrow_smsk,
@@ -1378,7 +1378,7 @@ BEGIN_CURSOR_BLOCK
/*color*/
BC_BLACK, BC_WHITE
};
BlenderCursor[BC_S_ARROWCURSOR] = &SArrowCursor;
END_CURSOR_BLOCK
@@ -1392,14 +1392,14 @@ BEGIN_CURSOR_BLOCK
0xE0, 0x3F, 0xE0, 0x1F, 0x00, 0x0E, 0x00, 0x06,
0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
static char earrow_smsk[] = {
0x00, 0x01, 0x00, 0x03, 0x00, 0x07, 0x00, 0x0F,
0xF0, 0x1F, 0xF0, 0x3F, 0xF0, 0x7F, 0xF0, 0xFF,
0xF0, 0x7F, 0xF0, 0x3F, 0xF0, 0x1F, 0x00, 0x0F,
0x00, 0x07, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00
};
static char earrow_lbm[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
@@ -1418,7 +1418,7 @@ BEGIN_CURSOR_BLOCK
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
static char earrow_lmsk[] = {
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00,
0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0F, 0x00,
@@ -1437,7 +1437,7 @@ BEGIN_CURSOR_BLOCK
0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x03, 0x00,
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
};
static BCursor EArrowCursor = {
/*small*/
earrow_sbm, earrow_smsk,
@@ -1450,7 +1450,7 @@ BEGIN_CURSOR_BLOCK
/*color*/
BC_BLACK, BC_WHITE
};
BlenderCursor[BC_E_ARROWCURSOR] = &EArrowCursor;
END_CURSOR_BLOCK
@@ -1464,14 +1464,14 @@ BEGIN_CURSOR_BLOCK
0xFC, 0x07, 0xF8, 0x07, 0x70, 0x00, 0x60, 0x00,
0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
static char warrow_smsk[] = {
0x80, 0x00, 0xC0, 0x00, 0xE0, 0x00, 0xF0, 0x00,
0xF8, 0x0F, 0xFC, 0x0F, 0xFE, 0x0F, 0xFF, 0x0F,
0xFE, 0x0F, 0xFC, 0x0F, 0xF8, 0x0F, 0xF0, 0x00,
0xE0, 0x00, 0xC0, 0x00, 0x80, 0x00, 0x00, 0x00
};
static char warrow_lbm[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00,
@@ -1490,7 +1490,7 @@ BEGIN_CURSOR_BLOCK
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
static char warrow_lmsk[] = {
0x00, 0x80, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00,
0x00, 0xE0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00,
@@ -1509,7 +1509,7 @@ BEGIN_CURSOR_BLOCK
0x00, 0xE0, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00,
0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
static BCursor WArrowCursor = {
/*small*/
warrow_sbm, warrow_smsk,
@@ -1522,7 +1522,7 @@ BEGIN_CURSOR_BLOCK
/*color*/
BC_BLACK, BC_WHITE
};
BlenderCursor[BC_W_ARROWCURSOR] = &WArrowCursor;
END_CURSOR_BLOCK
@@ -1537,14 +1537,14 @@ BEGIN_CURSOR_BLOCK
0x82, 0x43, 0x02, 0x47, 0x06, 0x6E, 0x04, 0x3C,
0x0C, 0x38, 0x38, 0x1C, 0xE0, 0x07, 0x00, 0x00
};
static char stop_smsk[] = {
0xE0, 0x07, 0xF8, 0x1F, 0xFC, 0x3F, 0x3E, 0x7C,
0x7E, 0x70, 0xFF, 0xF0, 0xF7, 0xE1, 0xE7, 0xE3,
0xC7, 0xE7, 0x87, 0xEF, 0x0F, 0xFF, 0x0E, 0x7E,
0x3E, 0x7C, 0xFC, 0x3F, 0xF8, 0x1F, 0xE0, 0x07
};
static char stop_lbm[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x0F, 0x00,
0x00, 0xFE, 0x7F, 0x00, 0x00, 0x0F, 0xF0, 0x00,
@@ -1563,7 +1563,7 @@ BEGIN_CURSOR_BLOCK
0x00, 0x0F, 0xF0, 0x00, 0x00, 0xFE, 0x7F, 0x00,
0x00, 0xF0, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00
};
static char stop_lmsk[] = {
0x00, 0xF0, 0x0F, 0x00, 0x00, 0xFE, 0x7F, 0x00,
0x80, 0xFF, 0xFF, 0x01, 0xC0, 0xFF, 0xFF, 0x03,
@@ -1582,7 +1582,7 @@ BEGIN_CURSOR_BLOCK
0xC0, 0xFF, 0xFF, 0x03, 0x80, 0xFF, 0xFF, 0x01,
0x00, 0xFE, 0x7F, 0x00, 0x00, 0xF0, 0x0F, 0x00
};
static BCursor StopCursor = {
/*small*/
stop_sbm, stop_smsk,
@@ -1595,7 +1595,7 @@ BEGIN_CURSOR_BLOCK
/*color*/
BC_BLACK, BC_WHITE
};
BlenderCursor[BC_STOPCURSOR] = &StopCursor;
END_CURSOR_BLOCK