diff options
| -rw-r--r-- | intern/atomic/intern/atomic_ops_unix.h | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 6 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_eval.cc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/intern/atomic/intern/atomic_ops_unix.h b/intern/atomic/intern/atomic_ops_unix.h index 0a0b988bd72..05d0fbf1856 100644 --- a/intern/atomic/intern/atomic_ops_unix.h +++ b/intern/atomic/intern/atomic_ops_unix.h @@ -49,8 +49,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __ATOMIC_OPS_GCC_H__ -#define __ATOMIC_OPS_GCC_H__ +#ifndef __ATOMIC_OPS_UNIX_H__ +#define __ATOMIC_OPS_UNIX_H__ #include "atomic_ops_utils.h" @@ -177,4 +177,4 @@ ATOMIC_INLINE uint8_t atomic_fetch_and_or_uint8(uint8_t *p, uint8_t b) # error "Missing implementation for 8-bit atomic operations" #endif -#endif /* __ATOMIC_OPS_GCC_H__ */ +#endif /* __ATOMIC_OPS_UNIX_H__ */ 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 */ |