bmo_subdivide_edgering.c now builds with release+debuginfo, also remove unused defines and correct include guards.

This commit is contained in:
Campbell Barton 2013-05-28 16:35:47 +00:00
parent 88d385ef70
commit fc7c0506b8
8 changed files with 12 additions and 15 deletions

@ -45,8 +45,6 @@ struct CollisionTree;
#define DO_INLINE MALWAYS_INLINE #define DO_INLINE MALWAYS_INLINE
#define CLOTH_MAX_THREAD 2
/* goal defines */ /* goal defines */
#define SOFTGOALSNAP 0.999f #define SOFTGOALSNAP 0.999f

@ -65,7 +65,7 @@
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* Specialized Utility Funcs */ /* Specialized Utility Funcs */
#ifdef DEBUG #ifndef NDEBUG
static unsigned int bm_verts_tag_count(BMesh *bm) static unsigned int bm_verts_tag_count(BMesh *bm)
{ {
int count = 0; int count = 0;

@ -20,8 +20,8 @@
* Monique Dewanchand * Monique Dewanchand
*/ */
#ifndef _COM_BokehBilateralBlurOperation_h #ifndef __COM_BILATERALBLUROPERATION_H__
#define _COM_BilateralBlurOperation_h #define __COM_BILATERALBLUROPERATION_H__
#include "COM_NodeOperation.h" #include "COM_NodeOperation.h"
#include "COM_QualityStepHelper.h" #include "COM_QualityStepHelper.h"

@ -20,8 +20,9 @@
* Monique Dewanchand * Monique Dewanchand
*/ */
#ifndef _COM_BokehBokehBlurOperation_h #ifndef __COM_BOKEHBLUROPERATION_H__
#define _COM_BokehBlurOperation_h #define __COM_BOKEHBLUROPERATION_H__
#include "COM_NodeOperation.h" #include "COM_NodeOperation.h"
#include "COM_QualityStepHelper.h" #include "COM_QualityStepHelper.h"

@ -20,8 +20,8 @@
* Monique Dewanchand * Monique Dewanchand
*/ */
#ifndef _COM_BokehDirectionalBlurOperation_h #ifndef __COM_DIRECTIONALBLUROPERATION_H__
#define _COM_DirectionalBlurOperation_h #define __COM_DIRECTIONALBLUROPERATION_H__
#include "COM_NodeOperation.h" #include "COM_NodeOperation.h"
#include "COM_QualityStepHelper.h" #include "COM_QualityStepHelper.h"

@ -20,8 +20,8 @@
* Monique Dewanchand * Monique Dewanchand
*/ */
#ifndef _COM_BokehGaussianBokehBlurOperation_h #ifndef __COM_GAUSSIANBOKEHBLUROPERATION_H__
#define _COM_GaussianBokehBlurOperation_h #define __COM_GAUSSIANBOKEHBLUROPERATION_H__
#include "COM_NodeOperation.h" #include "COM_NodeOperation.h"
#include "COM_BlurBaseOperation.h" #include "COM_BlurBaseOperation.h"
#include "COM_QualityStepHelper.h" #include "COM_QualityStepHelper.h"

@ -20,8 +20,8 @@
* Monique Dewanchand * Monique Dewanchand
*/ */
#ifndef _COM_BokehVariableSizeBokehBlurOperation_h #ifndef __COM_VARIABLESIZEBOKEHBLUROPERATION_H__
#define _COM_VariableSizeBokehBlurOperation_h #define __COM_VARIABLESIZEBOKEHBLUROPERATION_H__
#include "COM_NodeOperation.h" #include "COM_NodeOperation.h"
#include "COM_QualityStepHelper.h" #include "COM_QualityStepHelper.h"

@ -125,8 +125,6 @@ typedef struct ImagePaintPartialRedraw {
#define IMAPAINT_TILE_SIZE (1 << IMAPAINT_TILE_BITS) #define IMAPAINT_TILE_SIZE (1 << IMAPAINT_TILE_BITS)
#define IMAPAINT_TILE_NUMBER(size) (((size) + 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); 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_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); void *image_undo_push_tile(struct Image *ima, struct ImBuf *ibuf, struct ImBuf **tmpibuf, int x_tile, int y_tile);