From fc7c0506b8f4e7082804b27ea470ce348144d707 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 28 May 2013 16:35:47 +0000 Subject: bmo_subdivide_edgering.c now builds with release+debuginfo, also remove unused defines and correct include guards. --- source/blender/blenkernel/BKE_cloth.h | 2 -- source/blender/bmesh/operators/bmo_subdivide_edgering.c | 2 +- source/blender/compositor/operations/COM_BilateralBlurOperation.h | 4 ++-- source/blender/compositor/operations/COM_BokehBlurOperation.h | 5 +++-- source/blender/compositor/operations/COM_DirectionalBlurOperation.h | 4 ++-- .../blender/compositor/operations/COM_GaussianBokehBlurOperation.h | 4 ++-- .../compositor/operations/COM_VariableSizeBokehBlurOperation.h | 4 ++-- source/blender/editors/sculpt_paint/paint_intern.h | 2 -- 8 files changed, 12 insertions(+), 15 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h index 30b3ab38c6f..947e680d119 100644 --- a/source/blender/blenkernel/BKE_cloth.h +++ b/source/blender/blenkernel/BKE_cloth.h @@ -45,8 +45,6 @@ struct CollisionTree; #define DO_INLINE MALWAYS_INLINE -#define CLOTH_MAX_THREAD 2 - /* goal defines */ #define SOFTGOALSNAP 0.999f diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c index c2b9f349b56..0b3aeec0aea 100644 --- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c +++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c @@ -65,7 +65,7 @@ /* -------------------------------------------------------------------- */ /* Specialized Utility Funcs */ -#ifdef DEBUG +#ifndef NDEBUG static unsigned int bm_verts_tag_count(BMesh *bm) { int count = 0; diff --git a/source/blender/compositor/operations/COM_BilateralBlurOperation.h b/source/blender/compositor/operations/COM_BilateralBlurOperation.h index 8def90941ab..cfd96617681 100644 --- a/source/blender/compositor/operations/COM_BilateralBlurOperation.h +++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_BokehBilateralBlurOperation_h -#define _COM_BilateralBlurOperation_h +#ifndef __COM_BILATERALBLUROPERATION_H__ +#define __COM_BILATERALBLUROPERATION_H__ #include "COM_NodeOperation.h" #include "COM_QualityStepHelper.h" diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.h b/source/blender/compositor/operations/COM_BokehBlurOperation.h index 74ca6b7b058..d2944825583 100644 --- a/source/blender/compositor/operations/COM_BokehBlurOperation.h +++ b/source/blender/compositor/operations/COM_BokehBlurOperation.h @@ -20,8 +20,9 @@ * Monique Dewanchand */ -#ifndef _COM_BokehBokehBlurOperation_h -#define _COM_BokehBlurOperation_h +#ifndef __COM_BOKEHBLUROPERATION_H__ +#define __COM_BOKEHBLUROPERATION_H__ + #include "COM_NodeOperation.h" #include "COM_QualityStepHelper.h" diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.h b/source/blender/compositor/operations/COM_DirectionalBlurOperation.h index e13a13116db..641499ddde4 100644 --- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.h +++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_BokehDirectionalBlurOperation_h -#define _COM_DirectionalBlurOperation_h +#ifndef __COM_DIRECTIONALBLUROPERATION_H__ +#define __COM_DIRECTIONALBLUROPERATION_H__ #include "COM_NodeOperation.h" #include "COM_QualityStepHelper.h" diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h index 9fcf1e10e6a..09994043c75 100644 --- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_BokehGaussianBokehBlurOperation_h -#define _COM_GaussianBokehBlurOperation_h +#ifndef __COM_GAUSSIANBOKEHBLUROPERATION_H__ +#define __COM_GAUSSIANBOKEHBLUROPERATION_H__ #include "COM_NodeOperation.h" #include "COM_BlurBaseOperation.h" #include "COM_QualityStepHelper.h" diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h index d4025692549..7ba8df16795 100644 --- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h +++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_BokehVariableSizeBokehBlurOperation_h -#define _COM_VariableSizeBokehBlurOperation_h +#ifndef __COM_VARIABLESIZEBOKEHBLUROPERATION_H__ +#define __COM_VARIABLESIZEBOKEHBLUROPERATION_H__ #include "COM_NodeOperation.h" #include "COM_QualityStepHelper.h" diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index 81c33338b5c..df0fb8ec4f8 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -125,8 +125,6 @@ typedef struct ImagePaintPartialRedraw { #define IMAPAINT_TILE_SIZE (1 << IMAPAINT_TILE_BITS) #define IMAPAINT_TILE_NUMBER(size) (((size) + IMAPAINT_TILE_SIZE - 1) >> IMAPAINT_TILE_BITS) -#define IMAPAINT_CHAR_TO_FLOAT(c) ((c) / 255.0f) - int image_texture_paint_poll(struct bContext *C); void *image_undo_find_tile(struct Image *ima, struct ImBuf *ibuf, int x_tile, int y_tile, unsigned short **mask); void *image_undo_push_tile(struct Image *ima, struct ImBuf *ibuf, struct ImBuf **tmpibuf, int x_tile, int y_tile); -- cgit v1.2.3