[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51999] trunk/blender: code cleanup: unused defines & some formatting.
Campbell Barton
ideasman42 at gmail.com
Thu Nov 8 07:46:12 CET 2012
Revision: 51999
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51999
Author: campbellbarton
Date: 2012-11-08 06:46:10 +0000 (Thu, 08 Nov 2012)
Log Message:
-----------
code cleanup: unused defines & some formatting.
Modified Paths:
--------------
trunk/blender/intern/container/CTR_HashedPtr.h
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c
trunk/blender/source/blender/bmesh/operators/bmo_utils.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/imbuf/intern/dds/BlockDXT.h
trunk/blender/source/blender/imbuf/intern/dds/Stream.h
trunk/blender/source/blender/imbuf/intern/jp2.c
trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
trunk/blender/source/gameengine/Network/NG_NetworkDeviceInterface.h
trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h
trunk/blender/source/gameengine/SceneGraph/SG_IObject.h
Modified: trunk/blender/intern/container/CTR_HashedPtr.h
===================================================================
--- trunk/blender/intern/container/CTR_HashedPtr.h 2012-11-08 06:44:14 UTC (rev 51998)
+++ trunk/blender/intern/container/CTR_HashedPtr.h 2012-11-08 06:46:10 UTC (rev 51999)
@@ -46,13 +46,13 @@
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;
}
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-11-08 06:44:14 UTC (rev 51998)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-11-08 06:46:10 UTC (rev 51999)
@@ -1956,12 +1956,11 @@
/* 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;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-11-08 06:44:14 UTC (rev 51998)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-11-08 06:46:10 UTC (rev 51999)
@@ -401,6 +401,7 @@
}
else {
BLI_assert(0);
+ return NULL;
}
if (BM_edge_is_manifold(e_next)) {
Modified: trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c 2012-11-08 06:44:14 UTC (rev 51998)
+++ trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c 2012-11-08 06:46:10 UTC (rev 51999)
@@ -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
Modified: trunk/blender/source/blender/bmesh/operators/bmo_utils.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_utils.c 2012-11-08 06:44:14 UTC (rev 51998)
+++ trunk/blender/source/blender/bmesh/operators/bmo_utils.c 2012-11-08 06:46:10 UTC (rev 51999)
@@ -282,7 +282,7 @@
#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,
Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c 2012-11-08 06:44:14 UTC (rev 51998)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c 2012-11-08 06:46:10 UTC (rev 51999)
@@ -1199,8 +1199,8 @@
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);
}
Modified: trunk/blender/source/blender/imbuf/intern/dds/BlockDXT.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/BlockDXT.h 2012-11-08 06:44:14 UTC (rev 51998)
+++ trunk/blender/source/blender/imbuf/intern/dds/BlockDXT.h 2012-11-08 06:46:10 UTC (rev 51999)
@@ -173,24 +173,24 @@
};
*/
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;
Modified: trunk/blender/source/blender/imbuf/intern/dds/Stream.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/Stream.h 2012-11-08 06:44:14 UTC (rev 51998)
+++ trunk/blender/source/blender/imbuf/intern/dds/Stream.h 2012-11-08 06:46:10 UTC (rev 51999)
@@ -35,7 +35,7 @@
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);
};
Modified: trunk/blender/source/blender/imbuf/intern/jp2.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jp2.c 2012-11-08 06:44:14 UTC (rev 51998)
+++ trunk/blender/source/blender/imbuf/intern/jp2.c 2012-11-08 06:46:10 UTC (rev 51999)
@@ -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};
Modified: trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/radiance_hdr.c 2012-11-08 06:44:14 UTC (rev 51998)
+++ trunk/blender/source/blender/imbuf/intern/radiance_hdr.c 2012-11-08 06:46:10 UTC (rev 51999)
@@ -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];
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c 2012-11-08 06:44:14 UTC (rev 51998)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c 2012-11-08 06:46:10 UTC (rev 51999)
@@ -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 @@
#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;
Modified: trunk/blender/source/gameengine/Network/NG_NetworkDeviceInterface.h
===================================================================
--- trunk/blender/source/gameengine/Network/NG_NetworkDeviceInterface.h 2012-11-08 06:44:14 UTC (rev 51998)
+++ trunk/blender/source/gameengine/Network/NG_NetworkDeviceInterface.h 2012-11-08 06:46:10 UTC (rev 51999)
@@ -43,8 +43,8 @@
// candidates for shared/common implementation class
bool m_online;
public:
- NG_NetworkDeviceInterface() {};
- virtual ~NG_NetworkDeviceInterface() {};
+ NG_NetworkDeviceInterface() {}
+ virtual ~NG_NetworkDeviceInterface() {}
virtual void NextFrame()=0;
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h 2012-11-08 06:44:14 UTC (rev 51998)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h 2012-11-08 06:46:10 UTC (rev 51999)
@@ -59,7 +59,7 @@
virtual
~RAS_ICanvas(
) {
- };
+ }
virtual
void
Modified: trunk/blender/source/gameengine/SceneGraph/SG_IObject.h
===================================================================
--- trunk/blender/source/gameengine/SceneGraph/SG_IObject.h 2012-11-08 06:44:14 UTC (rev 51998)
+++ trunk/blender/source/gameengine/SceneGraph/SG_IObject.h 2012-11-08 06:46:10 UTC (rev 51999)
@@ -127,8 +127,8 @@
m_schedulefunc(NULL),
m_reschedulefunc(NULL)
{
- };
-
+ }
+
SG_Callbacks(
SG_ReplicationNewCallback repfunc,
SG_DestructionNewCallback destructfunc,
@@ -142,7 +142,7 @@
m_schedulefunc(schedulefunc),
m_reschedulefunc(reschedulefunc)
{
- };
+ }
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list