[Bf-blender-cvs] [3174254] master: Cleanup: style
Campbell Barton
noreply at git.blender.org
Sun Jan 24 02:22:25 CET 2016
Commit: 317425414203ce34e7d4f30caeb236b26a185ba4
Author: Campbell Barton
Date: Sun Jan 24 12:13:37 2016 +1100
Branches: master
https://developer.blender.org/rB317425414203ce34e7d4f30caeb236b26a185ba4
Cleanup: style
===================================================================
M intern/cycles/device/CMakeLists.txt
M source/blender/blenkernel/intern/seqmodifier.c
M source/blender/depsgraph/intern/depsgraph_debug.cc
M source/blender/editors/sculpt_paint/paint_mask.c
===================================================================
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt
index 4d962f5..2a9ec0c 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 f44f4fa..84d1c1b 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 7f3f328..298cb99 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 2702528..fa65416 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(
More information about the Bf-blender-cvs
mailing list