Cleanup of blender/ module; Makefiles now compile this warning free.
Mostly was unused variables, unused functions, missing prototypes and missing include files.
This commit is contained in:
@@ -456,11 +456,12 @@ static void *_edge_getCo(CCGEdge *e, int lvl, int x, int dataSize) {
|
||||
int levelBase = lvl + (1<<lvl) - 1;
|
||||
return &EDGE_getLevelData(e)[dataSize*(levelBase + x)];
|
||||
}
|
||||
#if 0
|
||||
static float *_edge_getNo(CCGEdge *e, int lvl, int x, int dataSize, int normalDataOffset) {
|
||||
int levelBase = lvl + (1<<lvl) - 1;
|
||||
return (float*) &EDGE_getLevelData(e)[dataSize*(levelBase + x) + normalDataOffset];
|
||||
}
|
||||
|
||||
#endif
|
||||
static void *_edge_getCoVert(CCGEdge *e, CCGVert *v, int lvl, int x, int dataSize) {
|
||||
int levelBase = lvl + (1<<lvl) - 1;
|
||||
if (v==e->v0) {
|
||||
|
||||
@@ -106,6 +106,8 @@
|
||||
#include "BKE_screen.h"
|
||||
#include "BKE_softbody.h"
|
||||
|
||||
#include "LBM_fluidsim.h"
|
||||
|
||||
#include "BPY_extern.h"
|
||||
|
||||
/* Local function protos */
|
||||
|
||||
@@ -113,6 +113,8 @@ struct bAction *ob_get_action(struct Object *ob);
|
||||
|
||||
void remake_action_ipos(struct bAction *act);
|
||||
|
||||
/* this needs review badly! (ton) */
|
||||
void world2bonespace(float boneSpaceMat[][4], float worldSpace[][4], float restPos[][4], float armPos[][4]);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -48,9 +48,9 @@ extern void mat3_to_vec_roll(float mat[][3], float *vec, float *roll);
|
||||
//------------------------ERROR CODES---------------------------------
|
||||
//This is here just to make me happy and to have more consistant error strings :)
|
||||
static const char sEditBoneError[] = "EditBone - Error: ";
|
||||
static const char sEditBoneBadArgs[] = "EditBone - Bad Arguments: ";
|
||||
// static const char sEditBoneBadArgs[] = "EditBone - Bad Arguments: ";
|
||||
static const char sBoneError[] = "Bone - Error: ";
|
||||
static const char sBoneBadArgs[] = "Bone - Bad Arguments: ";
|
||||
// static const char sBoneBadArgs[] = "Bone - Bad Arguments: ";
|
||||
|
||||
//----------------------(internal)
|
||||
//gets the bone->roll (which is a localspace roll) and puts it in parentspace
|
||||
|
||||
@@ -522,8 +522,8 @@ static PyObject *Material_getColorComponent( BPy_Material * self,
|
||||
static PyObject *Material_getOopsLoc( BPy_Material * self );
|
||||
static PyObject *Material_getOopsSel( BPy_Material * self );
|
||||
static PyObject *Material_getUsers( BPy_Material * self );
|
||||
static int Material_setSeptex( BPy_Material * self, PyObject * value );
|
||||
static PyObject *Material_getSeptex( BPy_Material * self );
|
||||
//static int Material_setSeptex( BPy_Material * self, PyObject * value );
|
||||
//static PyObject *Material_getSeptex( BPy_Material * self );
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Python BPy_Material methods declarations: */
|
||||
|
||||
@@ -65,6 +65,7 @@
|
||||
#include "BKE_depsgraph.h"
|
||||
|
||||
#include "BLI_arithb.h"
|
||||
#include "BLI_blenlib.h"
|
||||
|
||||
#include "blendef.h"
|
||||
#include "mydevice.h"
|
||||
|
||||
@@ -72,11 +72,14 @@ struct rctf;
|
||||
#include "BIF_drawscene.h"
|
||||
#include "BIF_meshtools.h"
|
||||
#include "BIF_editarmature.h"
|
||||
#include "BIF_editaction.h"
|
||||
#include "BIF_editnla.h"
|
||||
|
||||
#include "BLI_arithb.h"
|
||||
#include "BLI_blenlib.h"
|
||||
|
||||
#include "BDR_editobject.h"
|
||||
#include "BDR_editcurve.h"
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
|
||||
@@ -57,11 +57,11 @@ extern void chan_calc_mat(bPoseChannel *chan);
|
||||
//------------------------ERROR CODES---------------------------------
|
||||
//This is here just to make me happy and to have more consistant error strings :)
|
||||
static const char sPoseError[] = "Pose - Error: ";
|
||||
static const char sPoseBadArgs[] = "Pose - Bad Arguments: ";
|
||||
//static const char sPoseBadArgs[] = "Pose - Bad Arguments: ";
|
||||
static const char sPoseBoneError[] = "PoseBone - Error: ";
|
||||
static const char sPoseBoneBadArgs[] = "PoseBone - Bad Arguments: ";
|
||||
//static const char sPoseBoneBadArgs[] = "PoseBone - Bad Arguments: ";
|
||||
static const char sPoseBonesDictError[] = "PoseBone - Error: ";
|
||||
static const char sPoseBonesDictBadArgs[] = "PoseBone - Bad Arguments: ";
|
||||
//static const char sPoseBonesDictBadArgs[] = "PoseBone - Bad Arguments: ";
|
||||
|
||||
//################## PoseBonesDict_Type (internal) ########################
|
||||
/*This is an internal psuedo-dictionary type that allows for manipulation
|
||||
|
||||
@@ -55,6 +55,8 @@
|
||||
#include "BKE_object.h"
|
||||
#include "BKE_utildefines.h"
|
||||
|
||||
#include "BIF_toolbox.h"
|
||||
|
||||
#include <math.h>
|
||||
|
||||
// TODO check to see how many of these includes are necessary
|
||||
|
||||
@@ -241,9 +241,7 @@ static float cube[8][3] = {
|
||||
/* flag is same as for draw_object */
|
||||
void drawaxes(float size, int flag, char drawtype)
|
||||
{
|
||||
View3D *v3d= G.vd;
|
||||
int axis;
|
||||
float vec[3]= {0.0, 0.0, 0.0};
|
||||
|
||||
switch(drawtype) {
|
||||
|
||||
|
||||
@@ -1202,12 +1202,10 @@ static void do_info_add_groupmenu(void *arg, int event)
|
||||
|
||||
static uiBlock *info_add_groupmenu(void *arg_unused)
|
||||
{
|
||||
Group *group;
|
||||
uiBlock *block;
|
||||
short yco= 0;
|
||||
|
||||
Group *group;
|
||||
int a;
|
||||
int tot= BLI_countlist(&G.main->group);
|
||||
|
||||
block= uiNewBlock(&curarea->uiblocks, "add_groupmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
|
||||
uiBlockSetButmFunc(block, do_info_add_groupmenu, NULL);
|
||||
|
||||
@@ -419,7 +419,7 @@ static void vicon_move_down_draw(int x, int y, int w, int h, float alpha)
|
||||
|
||||
|
||||
/* this only works for the hardcoded buttons image, turning the grey AA pixels to alpha, and slight off-grey to half alpha */
|
||||
|
||||
#if 0
|
||||
static void clear_transp_rect_soft(unsigned char *transp, unsigned char *rect, int w, int h, int rowstride)
|
||||
{
|
||||
int x, y, val;
|
||||
@@ -453,6 +453,7 @@ static void clear_transp_rect_soft(unsigned char *transp, unsigned char *rect, i
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void clear_transp_rect(unsigned char *transp, unsigned char *rect, int w, int h, int rowstride)
|
||||
{
|
||||
@@ -470,7 +471,6 @@ static void clear_transp_rect(unsigned char *transp, unsigned char *rect, int w,
|
||||
|
||||
static void prepare_internal_icons(ImBuf* bbuf)
|
||||
{
|
||||
int x, y;
|
||||
int rowstride= bbuf->x*4;
|
||||
char *back= (char *)bbuf->rect;
|
||||
unsigned char transp[4];
|
||||
|
||||
@@ -1127,7 +1127,7 @@ static void p_chart_fill_boundary(PChart *chart, PEdge *be, int nedges)
|
||||
|
||||
pheap_delete(heap);
|
||||
}
|
||||
|
||||
#if 0
|
||||
static void p_chart_fill_boundaries(PChart *chart, PEdge *outer)
|
||||
{
|
||||
PEdge *e, *enext, *be;
|
||||
@@ -1151,7 +1151,7 @@ static void p_chart_fill_boundaries(PChart *chart, PEdge *outer)
|
||||
p_chart_fill_boundary(chart, e, nedges);
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
static void p_flush_uvs(PChart *chart)
|
||||
{
|
||||
PEdge *e;
|
||||
|
||||
@@ -958,7 +958,7 @@ static void do_render(int anim)
|
||||
waitcursor(0); // waitcursor checks rendering R.flag...
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
/* used for swapping with spare buffer, when images are different size */
|
||||
static void scalefastrect(unsigned int *recto, unsigned int *rectn, int oldx, int oldy, int newx, int newy)
|
||||
{
|
||||
@@ -982,7 +982,7 @@ static void scalefastrect(unsigned int *recto, unsigned int *rectn, int oldx, in
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
/* -------------- API: externally called --------------- */
|
||||
|
||||
/* not used anywhere ??? */
|
||||
|
||||
Reference in New Issue
Block a user