Cleanup: style
authorCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jan 2016 09:10:18 +0000 (20:10 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jan 2016 17:54:39 +0000 (04:54 +1100)
source/blender/blenkernel/intern/multires.c
source/blender/blenlib/intern/task.c
source/blender/compositor/intern/COM_MemoryBuffer.cpp
source/blender/compositor/operations/COM_DirectionalBlurOperation.h
source/blender/editors/space_clip/tracking_ops_intern.h
source/blender/imbuf/intern/cineon/cineonlib.h
source/blender/imbuf/intern/cineon/dpxlib.h
source/blender/imbuf/intern/cineon/logImageCore.h
source/blender/nodes/shader/nodes/node_shader_particle_info.c
source/blender/physics/intern/ConstrainedConjugateGradient.h

index b6895e619b0ef8ab51e22c630338d6966ba1bb1f..9679b585e6fa18510fd5aa8eb3ae146b01362183 100644 (file)
@@ -106,13 +106,12 @@ void multires_customdata_delete(Mesh *me)
 }
 
 /** Grid hiding **/
-static BLI_bitmap *multires_mdisps_upsample_hidden(BLI_bitmap *lo_hidden,
-                                                   int lo_level,
-                                                   int hi_level,
+static BLI_bitmap *multires_mdisps_upsample_hidden(
+        BLI_bitmap *lo_hidden,
+        int lo_level, int hi_level,
 
-                                                   /* assumed to be at hi_level (or
-                                                    *  null) */
-                                                   const BLI_bitmap *prev_hidden)
+        /* assumed to be at hi_level (or null) */
+        const BLI_bitmap *prev_hidden)
 {
        BLI_bitmap *subd;
        int hi_gridsize = BKE_ccg_gridsize(hi_level);
index 5a5fc8d5b7e32f872ea8d56559f9b2a7920b67ad..e7938b750dafa7b7b7a4036d8068ea6776509638 100644 (file)
@@ -786,7 +786,7 @@ void BLI_task_parallel_range(
         int start, int stop,
         void *userdata,
         TaskParallelRangeFunc func,
-               const bool use_threading)
+        const bool use_threading)
 {
        task_parallel_range_ex(start, stop, userdata, NULL, 0, func, NULL, use_threading, false);
 }
index 7ee5e2f7c5762d21554409e7f81572e66173f4c6..8900a5940e31455dc2fd4e152a2a9ca2be4545be 100644 (file)
@@ -178,7 +178,8 @@ void MemoryBuffer::writePixel(int x, int y, const float color[4])
            y >= this->m_rect.ymin && y < this->m_rect.ymax)
        {
                const int offset = (this->m_width * (y - this->m_rect.ymin) + x - this->m_rect.xmin) * this->m_num_channels;
-               memcpy(&this->m_buffer[offset], color, sizeof(float)*this->m_num_channels);     }
+               memcpy(&this->m_buffer[offset], color, sizeof(float) * this->m_num_channels);
+       }
 }
 
 void MemoryBuffer::addPixel(int x, int y, const float color[4])
index 641499ddde48191f537428228e134613fba89375..d9809eb029639e906535dc1df522aae3bcc5a7f7 100644 (file)
@@ -57,9 +57,9 @@ public:
        void setData(NodeDBlurData *data) { this->m_data = data; }
 
        void executeOpenCL(OpenCLDevice *device,
-                                              MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, 
-                                              MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, 
-                                              list<cl_kernel> *clKernelsToCleanUp);
+                          MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer,
+                          MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp,
+                          list<cl_kernel> *clKernelsToCleanUp);
        
 };
 #endif
index f6cb3e565e3eb13f5084a8f068fa4f2525f9b766..36af428b31feb8e0ac87c4c486297db545e4e3e7 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup spclip
  */
 
-#ifndef __TRACKING_OPS_INTERN_INTERN__
-#define __TRACKING_OPS_INTERN_INTERN__
+#ifndef __TRACKING_OPS_INTERN_H__
+#define __TRACKING_OPS_INTERN_H__
 
 struct bContext;
 struct SpaceClip;
@@ -42,4 +42,4 @@ void clip_tracking_clear_invisible_track_selection(struct SpaceClip *sc,
 void clip_tracking_show_cursor(struct bContext *C);
 void clip_tracking_hide_cursor(struct bContext *C);
 
-#endif /* __TRACKING_OPS_INTERN_INTERN__ */
\ No newline at end of file
+#endif /* __TRACKING_OPS_INTERN_H__ */
\ No newline at end of file
index 9333743a1bf4ffdf2f78ecb7de7ff17c0d9fe17f..775572debaf24aa576cd15daff8d3f1daed5ae54 100644 (file)
@@ -27,8 +27,8 @@
  */
 
 
-#ifndef __CINEON_LIB_H__
-#define __CINEON_LIB_H__
+#ifndef __CINEONLIB_H__
+#define __CINEONLIB_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -139,4 +139,4 @@ LogImageFile *cineonCreate(const char *filename, int width, int height, int bits
 }
 #endif
 
-#endif  /* __CINEON_LIB_H__ */
+#endif  /* __CINEONLIB_H__ */
index e910aaa61e12be825231cd2622b39f282c78a645..2b90d8c5e077f7a41405e47692abad68658bb2c2 100644 (file)
@@ -26,8 +26,8 @@
  */
 
 
-#ifndef __DPX_LIB_H__
-#define __DPX_LIB_H__
+#ifndef __DPXLIB_H__
+#define __DPXLIB_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -157,4 +157,4 @@ LogImageFile *dpxCreate(const char *filename, int width, int height, int bitsPer
 }
 #endif
 
-#endif
+#endif  /* __DPXLIB_H__ */
index 389e88a24de926e78c1e0b3a586ecf0331b3df44..e39df1ea096630201b5c4724af2f12d3656e8f9a 100644 (file)
@@ -30,8 +30,8 @@
  *  \ingroup imbcineon
  */
 
-#ifndef __LOG_IMAGE_CORE_H__
-#define __LOG_IMAGE_CORE_H__
+#ifndef __LOGIMAGECORE_H__
+#define __LOGIMAGECORE_H__
 
 #include <stdio.h>
 
@@ -278,4 +278,4 @@ BLI_INLINE unsigned int float_uint(float value, unsigned int max)
 }
 #endif
 
-#endif  /* __LOG_IMAGE_CORE_H__ */
+#endif  /* __LOGIMAGECORE_H__ */
index 6cc8de322afef752ef9495a178bfd4cc037c2d3a..5f0d81e98c9288ba67da97fd4756c50e67e2d54c 100644 (file)
@@ -52,10 +52,10 @@ static int gpu_shader_particle_info(GPUMaterial *mat, bNode *UNUSED(node), bNode
 {
 
        return GPU_stack_link(mat, "particle_info", in, out,
-                                                 GPU_builtin(GPU_PARTICLE_SCALAR_PROPS),
-                                                 GPU_builtin(GPU_PARTICLE_LOCATION),
-                                                 GPU_builtin(GPU_PARTICLE_VELOCITY),
-                                                 GPU_builtin(GPU_PARTICLE_ANG_VELOCITY));
+                             GPU_builtin(GPU_PARTICLE_SCALAR_PROPS),
+                             GPU_builtin(GPU_PARTICLE_LOCATION),
+                             GPU_builtin(GPU_PARTICLE_VELOCITY),
+                             GPU_builtin(GPU_PARTICLE_ANG_VELOCITY));
 }
 
 /* node type definition */
index 2d4389f67665abe6072a66f9386eb0be8ad551a5..f9c6931fe8cbf8e190cfa5303b8283c217c05da1 100644 (file)
@@ -1,6 +1,6 @@
 
-#ifndef EIGEN_CONSTRAINEDCG_H
-#define EIGEN_CONSTRAINEDCG_H
+#ifndef __CONSTRAINEDCONJUGATEGRADIENT_H__
+#define __CONSTRAINEDCONJUGATEGRADIENT_H__
 
 #include <Eigen/Core>
 
@@ -291,4 +291,4 @@ struct solve_retval<ConstrainedConjugateGradient<_MatrixType,_UpLo,_Filter,_Prec
 
 } // end namespace Eigen
 
-#endif // EIGEN_CONSTRAINEDCG_H
+#endif // __CONSTRAINEDCONJUGATEGRADIENT_H__