[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57084] trunk/blender/source/blender: bmo_subdivide_edgering.c now builds with release+debuginfo, also remove unused defines and correct include guards.
Campbell Barton
ideasman42 at gmail.com
Tue May 28 18:35:48 CEST 2013
Revision: 57084
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57084
Author: campbellbarton
Date: 2013-05-28 16:35:47 +0000 (Tue, 28 May 2013)
Log Message:
-----------
bmo_subdivide_edgering.c now builds with release+debuginfo, also remove unused defines and correct include guards.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_cloth.h
trunk/blender/source/blender/bmesh/operators/bmo_subdivide_edgering.c
trunk/blender/source/blender/compositor/operations/COM_BilateralBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
Modified: trunk/blender/source/blender/blenkernel/BKE_cloth.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_cloth.h 2013-05-28 15:08:13 UTC (rev 57083)
+++ trunk/blender/source/blender/blenkernel/BKE_cloth.h 2013-05-28 16:35:47 UTC (rev 57084)
@@ -45,8 +45,6 @@
#define DO_INLINE MALWAYS_INLINE
-#define CLOTH_MAX_THREAD 2
-
/* goal defines */
#define SOFTGOALSNAP 0.999f
Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide_edgering.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide_edgering.c 2013-05-28 15:08:13 UTC (rev 57083)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide_edgering.c 2013-05-28 16:35:47 UTC (rev 57084)
@@ -65,7 +65,7 @@
/* -------------------------------------------------------------------- */
/* Specialized Utility Funcs */
-#ifdef DEBUG
+#ifndef NDEBUG
static unsigned int bm_verts_tag_count(BMesh *bm)
{
int count = 0;
Modified: trunk/blender/source/blender/compositor/operations/COM_BilateralBlurOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_BilateralBlurOperation.h 2013-05-28 15:08:13 UTC (rev 57083)
+++ trunk/blender/source/blender/compositor/operations/COM_BilateralBlurOperation.h 2013-05-28 16:35:47 UTC (rev 57084)
@@ -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"
Modified: trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.h 2013-05-28 15:08:13 UTC (rev 57083)
+++ trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.h 2013-05-28 16:35:47 UTC (rev 57084)
@@ -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"
Modified: trunk/blender/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_DirectionalBlurOperation.h 2013-05-28 15:08:13 UTC (rev 57083)
+++ trunk/blender/source/blender/compositor/operations/COM_DirectionalBlurOperation.h 2013-05-28 16:35:47 UTC (rev 57084)
@@ -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"
Modified: trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h 2013-05-28 15:08:13 UTC (rev 57083)
+++ trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h 2013-05-28 16:35:47 UTC (rev 57084)
@@ -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"
Modified: trunk/blender/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h 2013-05-28 15:08:13 UTC (rev 57083)
+++ trunk/blender/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h 2013-05-28 16:35:47 UTC (rev 57084)
@@ -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"
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h 2013-05-28 15:08:13 UTC (rev 57083)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h 2013-05-28 16:35:47 UTC (rev 57084)
@@ -125,8 +125,6 @@
#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);
More information about the Bf-blender-cvs
mailing list