diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-11 00:10:28 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-11 00:10:28 +0400 |
commit | ab6c81021234b22fc0ad8d8bc729d5c4301759e7 (patch) | |
tree | 8ffc4eb624d1524b92fcdca132311556d887e56d | |
parent | 33b1939aee427426c214cbc060f2eac0c3d42dde (diff) |
remove unused function, found when syncing with bmesh, also remove/comment some unused defines
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 34 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_curve_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 12 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_force.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 19 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 2 |
6 files changed, 10 insertions, 63 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 5527ab0d331..802e6cd7374 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -294,7 +294,8 @@ static void createTransTexspace(TransInfo *t) /* ********************* edge (for crease) ***** */ -static void createTransEdge(TransInfo *t) { +static void createTransEdge(TransInfo *t) +{ EditMesh *em = ((Mesh *)t->obedit->data)->edit_mesh; TransData *td = NULL; EditEdge *eed; @@ -1919,8 +1920,8 @@ static void get_face_center(float *cent, EditMesh *em, EditVert *eve) } } -//way to overwrite what data is edited with transform -//static void VertsToTransData(TransData *td, EditVert *eve, BakeKey *key) +/* way to overwrite what data is edited with transform + * static void VertsToTransData(TransData *td, EditVert *eve, BakeKey *key) */ static void VertsToTransData(TransInfo *t, TransData *td, EditMesh *em, EditVert *eve) { td->flag = 0; @@ -1952,33 +1953,6 @@ static void VertsToTransData(TransInfo *t, TransData *td, EditMesh *em, EditVert } } -#if 0 -static void createTransBMeshVerts(TransInfo *t, BME_Mesh *bm, BME_TransData_Head *td) { - BME_Vert *v; - BME_TransData *vtd; - TransData *tob; - int i; - - tob = t->data = MEM_callocN(td->len*sizeof(TransData), "TransObData(Bevel tool)"); - - for (i=0,v=bm->verts.first;v;v=v->next) { - if ( (vtd = BME_get_transdata(td,v)) ) { - tob->loc = vtd->loc; - tob->val = &vtd->factor; - copy_v3_v3(tob->iloc,vtd->co); - copy_v3_v3(tob->center,vtd->org); - copy_v3_v3(tob->axismtx[0],vtd->vec); - tob->axismtx[1][0] = vtd->max ? *vtd->max : 0; - tob++; - i++; - } - } - /* since td is a memarena, it can hold more transdata than actual elements - * (i.e. we can't depend on td->len to determine the number of actual elements) */ - t->total = i; -} -#endif - static void createTransEditVerts(bContext *C, TransInfo *t) { ToolSettings *ts = CTX_data_tool_settings(C); diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 8214a32e9fb..545829911e5 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -255,7 +255,7 @@ typedef struct Curve { #define CU_STRETCH 128 #define CU_OFFS_PATHDIST 256 #define CU_FAST 512 /* Font: no filling inside editmode */ -#define CU_RETOPO 1024 +/* #define CU_RETOPO 1024 */ /* DEPRECATED */ #define CU_DS_EXPAND 2048 #define CU_PATH_RADIUS 4096 /* make use of the path radius if this is enabled (default for new curves) */ #define CU_DEFORM_FILL 8192 /* fill 2d curve after deformation */ diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index d772324cd72..66e1333bf66 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -94,7 +94,7 @@ typedef struct MSticky { typedef struct MSelect { int index; - int type; + int type; /* EDITVERT/EDITEDGE/EDITFACE */ } MSelect; typedef struct MTFace { @@ -196,11 +196,6 @@ typedef struct MRecast{ #define ME_SHARP (1<<9) /* only reason this flag remains a 'short' */ /* puno = vertexnormal (mface) */ -/* render assumes flips to be ordered like this */ -#define ME_FLIPV1 1 -#define ME_FLIPV2 2 -#define ME_FLIPV3 4 -#define ME_FLIPV4 8 #define ME_PROJXY 16 #define ME_PROJXZ 32 #define ME_PROJYZ 64 @@ -216,11 +211,6 @@ typedef struct MRecast{ #define ME_SMOOTH 1 #define ME_FACE_SEL 2 /* flag ME_HIDE==16 is used here too */ -/* mselect->type */ -#define ME_VSEl 0 -#define ME_ESEl 1 -#define ME_FSEL 2 - /* mtface->flag */ #define TF_SELECT 1 /* use MFace hide flag (after 2.43), should be able to reuse after 2.44 */ #define TF_ACTIVE 2 /* deprecated! */ diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index d45a8f83f76..61fc44d94ff 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -421,8 +421,8 @@ typedef struct SoftBody { #define OB_SB_SELF 512 #define OB_SB_FACECOLL 1024 #define OB_SB_EDGECOLL 2048 -#define OB_SB_COLLFINAL 4096 /* deprecated */ -#define OB_SB_BIG_UI 8192 +/* #define OB_SB_COLLFINAL 4096 */ /* deprecated */ +/* #define OB_SB_BIG_UI 8192 */ /* deprecated */ #define OB_SB_AERO_ANGLE 16384 /* sb->solverflags */ diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 6bcea71b5e9..29967dfc1bd 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -553,23 +553,6 @@ typedef struct SpaceClip { #define BUTS_CONSTRAINT 13 #define BUTS_EFFECTS 14 -/* sbuts->tab new (deprecated) */ -#define TAB_SHADING_MAT 0 -#define TAB_SHADING_TEX 1 -#define TAB_SHADING_RAD 2 -#define TAB_SHADING_WORLD 3 -#define TAB_SHADING_LAMP 4 - -#define TAB_OBJECT_OBJECT 0 -#define TAB_OBJECT_PHYSICS 1 -#define TAB_OBJECT_PARTICLE 2 - -#define TAB_SCENE_RENDER 0 -#define TAB_SCENE_WORLD 1 -#define TAB_SCENE_ANIM 2 -#define TAB_SCENE_SOUND 3 -#define TAB_SCENE_SEQUENCER 4 - /* buts->mainb new */ #define BCONTEXT_RENDER 0 #define BCONTEXT_SCENE 1 @@ -684,7 +667,7 @@ enum FileSortTypeE { /* Selection Flags in filesel: struct direntry, unsigned char selflag */ -#define ACTIVE_FILE (1<<1) +/* #define ACTIVE_FILE (1<<1) */ /* UNUSED */ #define HILITED_FILE (1<<2) #define SELECTED_FILE (1<<3) #define EDITING_FILE (1<<4) diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index cb545d2ee73..8f7db2a570f 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -510,7 +510,7 @@ typedef struct ColorMapping { #define MTEX_BLEND_SAT 11 #define MTEX_BLEND_VAL 12 #define MTEX_BLEND_COLOR 13 -#define MTEX_NUM_BLENDTYPES 14 +/* free for use */ #define MTEX_SOFT_LIGHT 15 #define MTEX_LIN_LIGHT 16 |