diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-05-09 20:00:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-05-09 20:03:34 +0300 |
| commit | 119230b565f10aeb13e7ee67ef5d75ec55015083 (patch) | |
| tree | eed9e1b849276ef235a77d6c184c36d0adf0dfc1 /source/blender | |
| parent | d8cf14fa67896cfe3144519e138fd1028bbdcb6e (diff) | |
Cleanup: header, style
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 6 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_eval.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 0da2bb0b1c4..ab5d1b4ff9b 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -3467,9 +3467,9 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface, /* Get material+textures color on hit point if required */ if (brush_usesMaterial(brush, scene)) { - dynamicPaint_doMaterialTex(bMats, sampleColor, &alpha_factor, brushOb, - bData->realCoord[bData->s_pos[index] + ss].v, - hitCoord, hitTri, dm); + dynamicPaint_doMaterialTex(bMats, sampleColor, &alpha_factor, brushOb, + bData->realCoord[bData->s_pos[index] + ss].v, + hitCoord, hitTri, dm); } /* Sample proximity colorband if required */ diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc index febea7d993d..adacbb6cb1a 100644 --- a/source/blender/depsgraph/intern/depsgraph_eval.cc +++ b/source/blender/depsgraph/intern/depsgraph_eval.cc @@ -248,7 +248,7 @@ static void schedule_node(TaskPool *pool, Depsgraph *graph, int layers, } if (node->num_links_pending == 0) { - bool is_scheduled = atomic_fetch_and_or_uint8((uint8_t*)&node->scheduled, (uint8_t)true); + bool is_scheduled = atomic_fetch_and_or_uint8((uint8_t *)&node->scheduled, (uint8_t)true); if (!is_scheduled) { if (node->is_noop()) { /* skip NOOP node, schedule children right away */ |