Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: unused defines & some formatting.

Browse Source
This commit is contained in:
Campbell Barton
2012-11-08 06:46:10 +00:00
parent b0e2218093
commit 617a73c573
14 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/container/CTR_HashedPtr.h
View File

@@ -46,13 +46,13 @@ class CTR_HashedPtr
void *m_valptr;
public:
CTR_HashedPtr(void *val) : m_valptr(val) {
};
}
unsigned int hash() const {
return CTR_Hash(m_valptr);
};
}
inline friend bool operator ==(const CTR_HashedPtr & rhs, const CTR_HashedPtr & lhs) {
return rhs.m_valptr == lhs.m_valptr;
};
}
void *getValue() const {
return m_valptr;
}

3
source/blender/blenkernel/intern/cdderivedmesh.c
View File

@@ -1956,12 +1956,11 @@ static DerivedMesh *cddm_from_bmesh_ex(struct BMesh *bm, int use_mdisps,
/* avoid this where possiblem, takes extra memory */
if (use_tessface) {
int *polyindex;
BM_mesh_elem_index_ensure(bm, BM_FACE);
index = dm->getTessFaceDataArray(dm, CD_ORIGINDEX);
for (i = 0; i < dm->numTessFaceData; i++, index++, polyindex++) {
for (i = 0; i < dm->numTessFaceData; i++, index++) {
MFace *mf = &mface[i];
const BMLoop **l = em_looptris[i];
efa = l[0]->f;

1
source/blender/bmesh/intern/bmesh_queries.c
View File

@@ -401,6 +401,7 @@ BMLoop *BM_vert_step_fan_loop(BMLoop *l, BMEdge **e_step)
}
else {
BLI_assert(0);
return NULL;
}
if (BM_edge_is_manifold(e_next)) {

4
source/blender/bmesh/operators/bmo_smooth_laplacian.c
View File

@@ -43,8 +43,8 @@
#include "intern/bmesh_operators_private.h" /* own include */
#define SMOOTH_LAPLACIAN_AREA_FACTOR 4.0f
#define SMOOTH_LAPLACIAN_EDGE_FACTOR 2.0f
// #define SMOOTH_LAPLACIAN_AREA_FACTOR 4.0f /* UNUSED */
// #define SMOOTH_LAPLACIAN_EDGE_FACTOR 2.0f /* UNUSED */
#define SMOOTH_LAPLACIAN_MAX_EDGE_PERCENTAGE 1.8f
#define SMOOTH_LAPLACIAN_MIN_EDGE_PERCENTAGE 0.15f

2
source/blender/bmesh/operators/bmo_utils.c
View File

@@ -282,7 +282,7 @@ void bmo_region_extend_exec(BMesh *bm, BMOperator *op)
#define FACE_VIS 1
#define FACE_FLAG 2
#define FACE_MARK 4
// #define FACE_MARK 4 /* UNUSED */
#define FACE_FLIP 8
/* NOTE: these are the original recalc_face_normals comment in editmesh_mods.c,

4
source/blender/editors/mesh/editmesh_select.c
View File

@@ -1199,8 +1199,8 @@ static float step_cost_3_v3(const float v1[3], const float v2[3], const float v3
static float edgetag_cut_cost(BMEdge *e1, BMEdge *e2, BMVert *v)
{
BMVert *v1 = (e1->v1 == v) ? e1->v2 : e1->v1;
BMVert *v2 = (e2->v1 == v) ? e2->v2 : e2->v1;
BMVert *v1 = BM_edge_other_vert(e1, v);
BMVert *v2 = BM_edge_other_vert(e2, v);
return step_cost_3_v3(v1->co, v->co, v2->co);
}

36
source/blender/imbuf/intern/dds/BlockDXT.h
View File

@@ -173,24 +173,24 @@ struct AlphaBlockDXT5
};
*/
uint64 u;
uint8 alpha0() const { return u & 0xffLL; };
uint8 alpha1() const { return (u >> 8) & 0xffLL; };
uint8 bits0() const { return (u >> 16) & 0x7LL; };
uint8 bits1() const { return (u >> 19) & 0x7LL; };
uint8 bits2() const { return (u >> 22) & 0x7LL; };
uint8 bits3() const { return (u >> 25) & 0x7LL; };
uint8 bits4() const { return (u >> 28) & 0x7LL; };
uint8 bits5() const { return (u >> 31) & 0x7LL; };
uint8 bits6() const { return (u >> 34) & 0x7LL; };
uint8 bits7() const { return (u >> 37) & 0x7LL; };
uint8 bits8() const { return (u >> 40) & 0x7LL; };
uint8 bits9() const { return (u >> 43) & 0x7LL; };
uint8 bitsA() const { return (u >> 46) & 0x7LL; };
uint8 bitsB() const { return (u >> 49) & 0x7LL; };
uint8 bitsC() const { return (u >> 52) & 0x7LL; };
uint8 bitsD() const { return (u >> 55) & 0x7LL; };
uint8 bitsE() const { return (u >> 58) & 0x7LL; };
uint8 bitsF() const { return (u >> 61) & 0x7LL; };
uint8 alpha0() const { return u & 0xffLL; }
uint8 alpha1() const { return (u >> 8) & 0xffLL; }
uint8 bits0() const { return (u >> 16) & 0x7LL; }
uint8 bits1() const { return (u >> 19) & 0x7LL; }
uint8 bits2() const { return (u >> 22) & 0x7LL; }
uint8 bits3() const { return (u >> 25) & 0x7LL; }
uint8 bits4() const { return (u >> 28) & 0x7LL; }
uint8 bits5() const { return (u >> 31) & 0x7LL; }
uint8 bits6() const { return (u >> 34) & 0x7LL; }
uint8 bits7() const { return (u >> 37) & 0x7LL; }
uint8 bits8() const { return (u >> 40) & 0x7LL; }
uint8 bits9() const { return (u >> 43) & 0x7LL; }
uint8 bitsA() const { return (u >> 46) & 0x7LL; }
uint8 bitsB() const { return (u >> 49) & 0x7LL; }
uint8 bitsC() const { return (u >> 52) & 0x7LL; }
uint8 bitsD() const { return (u >> 55) & 0x7LL; }
uint8 bitsE() const { return (u >> 58) & 0x7LL; }
uint8 bitsF() const { return (u >> 61) & 0x7LL; }
void evaluatePalette(uint8 alpha[8]) const;
void evaluatePalette8(uint8 alpha[8]) const;

2
source/blender/imbuf/intern/dds/Stream.h
View File

@@ -35,7 +35,7 @@ struct Stream
unsigned char *mem; // location in memory
unsigned int size; // size
unsigned int pos; // current position
Stream(unsigned char *m, unsigned int s) : mem(m), size(s), pos(0) {};
Stream(unsigned char *m, unsigned int s) : mem(m), size(s), pos(0) {}
unsigned int seek(unsigned int p);
};

2
source/blender/imbuf/intern/jp2.c
View File

@@ -41,7 +41,7 @@
#include "openjpeg.h"
#define JP2_FILEHEADER_SIZE 14
// #define JP2_FILEHEADER_SIZE 14 /* UNUSED */
static char JP2_HEAD[] = {0x0, 0x0, 0x0, 0x0C, 0x6A, 0x50, 0x20, 0x20, 0x0D, 0x0A, 0x87, 0x0A};
static char J2K_HEAD[] = {0xFF, 0x4F, 0xFF, 0x51, 0x00};

1
source/blender/imbuf/intern/radiance_hdr.c
View File

@@ -65,7 +65,6 @@
#define BLU 2
#define EXP 3
#define COLXS 128
#define STR_MAX 540
typedef unsigned char RGBE[4];
typedef float fCOLOR[3];

7
source/blender/nodes/composite/nodes/node_composite_colorSpill.c
View File

@@ -29,12 +29,8 @@
* \ingroup cmpnodes
*/
#include "node_composite_util.h"
#define AVG(a, b) ((a + b) / 2)
/* ******************* Color Spill Supression ********************************* */
static bNodeSocketTemplate cmp_node_color_spill_in[] = {
{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
@@ -49,6 +45,9 @@ static bNodeSocketTemplate cmp_node_color_spill_out[] = {
#ifdef WITH_COMPOSITOR_LEGACY
#define AVG(a, b) ((a + b) / 2)
static void do_simple_spillmap_red(bNode *node, float* out, float *in)
{
NodeColorspill *ncs;

4
source/gameengine/Network/NG_NetworkDeviceInterface.h
View File

@@ -43,8 +43,8 @@ private:
// candidates for shared/common implementation class
bool m_online;
public:
NG_NetworkDeviceInterface() {};
virtual ~NG_NetworkDeviceInterface() {};
NG_NetworkDeviceInterface() {}
virtual ~NG_NetworkDeviceInterface() {}
virtual void NextFrame()=0;

2
source/gameengine/Rasterizer/RAS_ICanvas.h
View File

@@ -59,7 +59,7 @@ public:
virtual
~RAS_ICanvas(
) {
};
}
virtual
void

6
source/gameengine/SceneGraph/SG_IObject.h
View File

@@ -127,8 +127,8 @@ struct SG_Callbacks
m_schedulefunc(NULL),
m_reschedulefunc(NULL)
{
};
}
SG_Callbacks(
SG_ReplicationNewCallback repfunc,
SG_DestructionNewCallback destructfunc,
@@ -142,7 +142,7 @@ struct SG_Callbacks
m_schedulefunc(schedulefunc),
m_reschedulefunc(reschedulefunc)
{
};
}
SG_ReplicationNewCallback m_replicafunc;
SG_DestructionNewCallback m_destructionfunc;