diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-01-24 04:13:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-01-24 04:13:37 +0300 |
| commit | 317425414203ce34e7d4f30caeb236b26a185ba4 (patch) | |
| tree | 8742b9c2cd56564a700b6a10a16b8b1878cbf103 | |
| parent | 0284fe857969445c9efb3ee2e2dbba0babbe543d (diff) | |
Cleanup: style
| -rw-r--r-- | intern/cycles/device/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/seqmodifier.c | 3 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_debug.cc | 3 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_mask.c | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt index 4d962f5e95f..2a9ec0c3818 100644 --- a/intern/cycles/device/CMakeLists.txt +++ b/intern/cycles/device/CMakeLists.txt @@ -15,10 +15,14 @@ set(INC_SYS ) if(WITH_CUDA_DYNLOAD) - list(APPEND INC ../../../extern/cuew/include) + list(APPEND INC + ../../../extern/cuew/include + ) add_definitions(-DWITH_CUDA_DYNLOAD) else() - list(APPEND INC_SYS ${CUDA_TOOLKIT_INCLUDE}) + list(APPEND INC_SYS + ${CUDA_TOOLKIT_INCLUDE} + ) add_definitions(-DCYCLES_CUDA_NVCC_EXECUTABLE="${CUDA_NVCC_EXECUTABLE}") endif() diff --git a/source/blender/blenkernel/intern/seqmodifier.c b/source/blender/blenkernel/intern/seqmodifier.c index f44f4fa3291..84d1c1bc414 100644 --- a/source/blender/blenkernel/intern/seqmodifier.c +++ b/source/blender/blenkernel/intern/seqmodifier.c @@ -817,7 +817,8 @@ static void tonemapmodifier_apply(struct SequenceModifierData *smd, minl = (L < minl) ? L : minl; if (fp != NULL) { fp += 4; - } else { + } + else { cp += 4; } } diff --git a/source/blender/depsgraph/intern/depsgraph_debug.cc b/source/blender/depsgraph/intern/depsgraph_debug.cc index 7f3f328502f..298cb996f3a 100644 --- a/source/blender/depsgraph/intern/depsgraph_debug.cc +++ b/source/blender/depsgraph/intern/depsgraph_debug.cc @@ -326,7 +326,8 @@ static void deg_debug_graphviz_node_fillcolor(const DebugContext &ctx, int color_index = deg_debug_node_color_index(node); const char *base_color = color_index < 0 ? defaultcolor : deg_debug_colors_light[color_index % deg_debug_max_colors]; if (ctx.show_tags && - (node->flag & (DEPSNODE_FLAG_DIRECTLY_MODIFIED | DEPSNODE_FLAG_NEEDS_UPDATE))) { + (node->flag & (DEPSNODE_FLAG_DIRECTLY_MODIFIED | DEPSNODE_FLAG_NEEDS_UPDATE))) + { deg_debug_fprintf(ctx, "\""); for (int i = 0; i < num_stripes; ++i) { if (i > 0) { diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c index 27025280b4c..fa654165f6a 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.c +++ b/source/blender/editors/sculpt_paint/paint_mask.c @@ -151,7 +151,7 @@ static int mask_flood_fill_exec(bContext *C, wmOperator *op) MaskTaskData data = { .ob = ob, .pbvh = pbvh, .nodes = nodes, .multires = multires, - .mode = mode, .value = value, + .mode = mode, .value = value, }; BLI_task_parallel_range( |