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(subdiv_ccg);
subdiv_ccg_init_faces_neighborhood(subdiv_ccg); subdiv_ccg_init_faces_neighborhood(subdiv_ccg);
if (!subdiv_ccg_evaluate_grids( 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_ccg_destroy(subdiv_ccg);
BKE_subdiv_stats_end(&subdiv->stats, SUBDIV_STATS_SUBDIV_TO_CCG); BKE_subdiv_stats_end(&subdiv->stats, SUBDIV_STATS_SUBDIV_TO_CCG);
return NULL; return NULL;

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) { if (bh->len) {
#ifdef USE_BHEAD_READ_ON_DEMAND #ifdef USE_BHEAD_READ_ON_DEMAND
BHead *bh_orig = bh; BHead *bh_orig = bh;
#endif #endif
/* switch is based on file dna */ /* switch is based on file dna */
if (bh->SDNAnr && (fd->flags & FD_FLAGS_SWITCH_ENDIAN)) { 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; return NULL;
} }
} }
#endif #endif
switch_endian_structs(fd->filesdna, bh); switch_endian_structs(fd->filesdna, bh);
} }

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

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

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

@@ -21,8 +21,8 @@
#ifndef __DNA_UTILS_H__ #ifndef __DNA_UTILS_H__
#define __DNA_UTILS_H__ #define __DNA_UTILS_H__
struct MemArena;
struct GHash; struct GHash;
struct MemArena;
int DNA_elem_array_size(const char *str); 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) { if (totdim > 1) {
totdim--; totdim--;
const int end = dim_size[totdim] - 1; 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); rna_array_as_string_recursive(type, buf_p, totdim, dim_size, dynstr);
if (i < end || !end) { if (i < end || !end) {
BLI_dynstr_append(dynstr, ", "); BLI_dynstr_append(dynstr, ", ");