[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42561] trunk/blender/source/blender: remove unused function, found when syncing with bmesh, also remove/ comment some unused defines

Campbell Barton ideasman42 at gmail.com
Sat Dec 10 21:10:33 CET 2011 

Revision: 42561
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42561
Author:   campbellbarton
Date:     2011-12-10 20:10:28 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
remove unused function, found when syncing with bmesh, also remove/comment some unused defines

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_conversions.c
    trunk/blender/source/blender/makesdna/DNA_curve_types.h
    trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
    trunk/blender/source/blender/makesdna/DNA_object_force.h
    trunk/blender/source/blender/makesdna/DNA_space_types.h
    trunk/blender/source/blender/makesdna/DNA_texture_types.h

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2011-12-10 18:44:55 UTC (rev 42560)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2011-12-10 20:10:28 UTC (rev 42561)
@@ -294,7 +294,8 @@
 
 /* ********************* 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 @@
 	}
 }
 
-//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 @@
 	}
 }
 
-#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);

Modified: trunk/blender/source/blender/makesdna/DNA_curve_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_curve_types.h	2011-12-10 18:44:55 UTC (rev 42560)
+++ trunk/blender/source/blender/makesdna/DNA_curve_types.h	2011-12-10 20:10:28 UTC (rev 42561)
@@ -255,7 +255,7 @@
 #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 */

Modified: trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_meshdata_types.h	2011-12-10 18:44:55 UTC (rev 42560)
+++ trunk/blender/source/blender/makesdna/DNA_meshdata_types.h	2011-12-10 20:10:28 UTC (rev 42561)
@@ -94,7 +94,7 @@
 
 typedef struct MSelect {
 	int index;
-	int type;
+	int type; /* EDITVERT/EDITEDGE/EDITFACE */
 } MSelect;
 
 typedef struct MTFace {
@@ -196,11 +196,6 @@
 #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 @@
 #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! */

Modified: trunk/blender/source/blender/makesdna/DNA_object_force.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_object_force.h	2011-12-10 18:44:55 UTC (rev 42560)
+++ trunk/blender/source/blender/makesdna/DNA_object_force.h	2011-12-10 20:10:28 UTC (rev 42561)
@@ -421,8 +421,8 @@
 #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 */

Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h	2011-12-10 18:44:55 UTC (rev 42560)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h	2011-12-10 20:10:28 UTC (rev 42561)
@@ -553,23 +553,6 @@
 #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 @@
 
 
 /* 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)

Modified: trunk/blender/source/blender/makesdna/DNA_texture_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_texture_types.h	2011-12-10 18:44:55 UTC (rev 42560)
+++ trunk/blender/source/blender/makesdna/DNA_texture_types.h	2011-12-10 20:10:28 UTC (rev 42561)
@@ -510,7 +510,7 @@
 #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

More information about the Bf-blender-cvs mailing list