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

Cleanup: header, style

Browse Source
This commit is contained in:
Campbell Barton 2016-05-10 03:00:37 +10:00
parent d8cf14fa67
commit 119230b565
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/atomic/intern/atomic_ops_unix.h
View File

@ -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__ */

6
source/blender/blenkernel/intern/dynamicpaint.c
View File

@ -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 */

2
source/blender/depsgraph/intern/depsgraph_eval.cc
View File

@ -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 */