Cleanup: style
This commit is contained in:
parent
306337afea
commit
d5ddc52ae1
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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__ */
|
||||
#endif /* __TRACKING_OPS_INTERN_H__ */
|
|
@ -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__ */
|
||||
|
|
|
@ -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__ */
|
||||
|
|
|
@ -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__ */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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__
|
||||
|
|
Loading…
Reference in New Issue