Cleanup: header, style
authorCampbell Barton <ideasman42@gmail.com>
Mon, 9 May 2016 17:00:37 +0000 (03:00 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 9 May 2016 17:03:34 +0000 (03:03 +1000)
intern/atomic/intern/atomic_ops_unix.h
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/depsgraph/intern/depsgraph_eval.cc

index 0a0b988bd728cbd08c611db2ee3f9d1c2005f1ec..05d0fbf18567c706d8608324ed231c10c5e57141 100644 (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__ */
index 0da2bb0b1c495dca0be6ad7fbd8354f5b5a283b1..ab5d1b4ff9b01161cc0bc413f11dc163e2395771 100644 (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       */
index febea7d993d9e37d4db064eb04ff6df9fe32c800..adacbb6cb1aa2782ab24b413c7c771f2f0821b98 100644 (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 */