kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton 2016-01-24 12:13:37 +11:00
parent 0284fe8579
commit 3174254142
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/device/CMakeLists.txt
View File

@ -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()

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

@ -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;
}
}

3
source/blender/depsgraph/intern/depsgraph_debug.cc
View File

@ -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) {

2
source/blender/editors/sculpt_paint/paint_mask.c
View File

@ -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(