[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11312] trunk/blender/source/blender: added commends to some DNA_*.h files - as well as some TODO's for removal.

Campbell Barton cbarton at metavr.com
Thu Jul 19 02:42:01 CEST 2007


Revision: 11312
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11312
Author:   campbellbarton
Date:     2007-07-19 02:42:01 +0200 (Thu, 19 Jul 2007)

Log Message:
-----------
added commends to some DNA_*.h files - as well as some TODO's for removal.
header_view3d.c was doign an implicit declaration also.

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_group_types.h
    trunk/blender/source/blender/makesdna/DNA_image_types.h
    trunk/blender/source/blender/makesdna/DNA_lamp_types.h
    trunk/blender/source/blender/makesdna/DNA_mesh_types.h
    trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
    trunk/blender/source/blender/makesdna/DNA_nla_types.h
    trunk/blender/source/blender/makesdna/DNA_object_types.h
    trunk/blender/source/blender/makesdna/DNA_scene_types.h
    trunk/blender/source/blender/makesdna/DNA_world_types.h
    trunk/blender/source/blender/src/header_view3d.c

Modified: trunk/blender/source/blender/makesdna/DNA_group_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_group_types.h	2007-07-18 21:16:07 UTC (rev 11311)
+++ trunk/blender/source/blender/makesdna/DNA_group_types.h	2007-07-19 00:42:01 UTC (rev 11312)
@@ -52,6 +52,10 @@
 	ID id;
 	
 	ListBase gobject;	/* GroupObject */
+	
+	/* Bad design, since layers stored in the scenes 'Base'
+	 * the objects that show in the group can change depending
+	 * on the last used scene */
 	unsigned int layer;
 	int pad;
 } Group;

Modified: trunk/blender/source/blender/makesdna/DNA_image_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_image_types.h	2007-07-18 21:16:07 UTC (rev 11311)
+++ trunk/blender/source/blender/makesdna/DNA_image_types.h	2007-07-19 00:42:01 UTC (rev 11312)
@@ -67,7 +67,7 @@
 typedef struct Image {
 	ID id;
 	
-	char name[240];
+	char name[240];			/* file path */
 	
 	ListBase ibufs;			/* not written in file */
 	

Modified: trunk/blender/source/blender/makesdna/DNA_lamp_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_lamp_types.h	2007-07-18 21:16:07 UTC (rev 11311)
+++ trunk/blender/source/blender/makesdna/DNA_lamp_types.h	2007-07-19 00:42:01 UTC (rev 11312)
@@ -54,7 +54,7 @@
 	
 	float energy, dist, spotsize, spotblend;
 	float haint;
-	float att1, att2;
+	float att1, att2;	/* Quad1 and Quad2 attenuation */
 	
 	float clipsta, clipend, shadspotsize;
 	float bias, soft;

Modified: trunk/blender/source/blender/makesdna/DNA_mesh_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_mesh_types.h	2007-07-18 21:16:07 UTC (rev 11311)
+++ trunk/blender/source/blender/makesdna/DNA_mesh_types.h	2007-07-19 00:42:01 UTC (rev 11312)
@@ -61,19 +61,19 @@
 	struct Key *key;
 	struct Material **mat;
 
-	struct MFace *mface;
-	struct MTFace *mtface;
+	struct MFace *mface;	/* array of mesh object mode faces */
+	struct MTFace *mtface;	/* store face UV's and texture here */
 	struct TFace *tface;	/* depecrated, use mtface */
-	struct MVert *mvert;
-	struct MEdge *medge;
+	struct MVert *mvert;	/* array of verts */
+	struct MEdge *medge;	/* array of edges */
 	struct MDeformVert *dvert;	/* __NLA */
-	struct MCol *mcol;
+	struct MCol *mcol;		/* array of colors, this must be the number of faces * 4 */
 	struct MSticky *msticky;
 	struct Mesh *texcomesh;
 	struct MSelect *mselect;
 	
-	struct OcInfo *oc;		/* not written in file */
-	void *sumohandle;
+	struct OcInfo *oc;		/* not written in file - TODO remove this! */
+	void *sumohandle;		/* this is not used anywhere anymore - TODO remove this too (Campbell)*/
 
 	struct CustomData vdata, edata, fdata;
 
@@ -91,7 +91,7 @@
 
 	short subdiv, subdivr;
 	short totcol;
-	short subsurftype; 
+	short subsurftype;		/* only kept for backwards compat, not used anymore */
 
 	struct Multires *mr;		/* Multiresolution modeling data */
 	struct PartialVisibility *pv;
@@ -103,7 +103,7 @@
 
 /* deprecated by MTFace, only here for file reading */
 typedef struct TFace {
-	void *tpage;
+	void *tpage;	/* the faces image for the active UVLayer */
 	float uv[4][2];
 	unsigned int col[4];
 	char flag, transp;

Modified: trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_meshdata_types.h	2007-07-18 21:16:07 UTC (rev 11311)
+++ trunk/blender/source/blender/makesdna/DNA_meshdata_types.h	2007-07-19 00:42:01 UTC (rev 11312)
@@ -66,8 +66,10 @@
 	char flag, mat_nr;
 } MVert;
 
+/* at the moment alpha is abused for vertex painting
+ * and not used for transperency, note that red and blue are swapped */
 typedef struct MCol {
-	char a, r, g, b;
+	char a, r, g, b;	
 } MCol;
 
 typedef struct MSticky {
@@ -231,6 +233,8 @@
 #define TF_SOLID	0
 #define TF_ADD		1
 #define TF_ALPHA	2
+
+/* sub is not available in the user interface anymore */
 #define TF_SUB		3
 
 /* mtface->unwrap */

Modified: trunk/blender/source/blender/makesdna/DNA_nla_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_nla_types.h	2007-07-18 21:16:07 UTC (rev 11311)
+++ trunk/blender/source/blender/makesdna/DNA_nla_types.h	2007-07-19 00:42:01 UTC (rev 11312)
@@ -88,7 +88,7 @@
 /* strip->flag */
 #define ACTSTRIP_SELECT			0x01
 #define ACTSTRIP_USESTRIDE		0x02
-#define ACTSTRIP_BLENDTONEXT	0x04
+#define ACTSTRIP_BLENDTONEXT	0x04	/* This is not used anywhere */
 #define ACTSTRIP_HOLDLASTFRAME	0x08
 #define ACTSTRIP_ACTIVE			0x10
 #define ACTSTRIP_LOCK_ACTION	0x20

Modified: trunk/blender/source/blender/makesdna/DNA_object_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_object_types.h	2007-07-18 21:16:07 UTC (rev 11311)
+++ trunk/blender/source/blender/makesdna/DNA_object_types.h	2007-07-19 00:42:01 UTC (rev 11312)
@@ -69,7 +69,8 @@
 /* boundbox flag */
 #define OB_BB_DISABLED	1
 
-/* OcInfo and LBuf structs are for the Enji gameengine */
+/* OcInfo and LBuf structs are for the Enji gameengine
+ * These structs are not needed anymore, both should be removed */
 
 typedef struct OcInfo {
 	float dvec[3];
@@ -102,7 +103,7 @@
 	
 	ListBase constraintChannels;
 	ListBase effect;
-	ListBase network;
+	ListBase network;	/* This is not used anywhere - TODO, should be removed (Campbell)*/
 	ListBase disp;
 	ListBase defbase;
 	ListBase modifiers; /* list of ModifierData structures */
@@ -154,7 +155,7 @@
 	
 	char dt, dtx;
 	char totcol;	/* copy of mesh or curve or meta */
-	char actcol;
+	char actcol;	/* currently selected material in the user interface */
 	char empty_drawtype, pad1[7];
 	float empty_drawsize;
 	
@@ -164,12 +165,14 @@
 	ListBase controllers;
 	ListBase actuators;
 
-    void *sumohandle;
+	/* now used to store cache particles,
+	 * should be renamed see effect.c (Campbell) */
+    void *sumohandle;		
     
 	float bbsize[3];
 	short index;			/* custom index, for renderpasses */
 	unsigned short actdef;	/* current deformation group */
-	float col[4];
+	float col[4];			/* object color, adjusted via IPO's only */
 	/**
 	 * Settings for game objects
 	 * bit 0: Object has dynamic behaviour
@@ -218,6 +221,7 @@
 /*#endif*/
 } Object;
 
+/* Warning, this is not used anymore because hooks are now modifiers */
 typedef struct ObHook {
 	struct ObHook *next, *prev;
 	

Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h	2007-07-18 21:16:07 UTC (rev 11311)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h	2007-07-19 00:42:01 UTC (rev 11312)
@@ -424,7 +424,7 @@
 	
 	void *ed;
 	struct Radio *radio;
-	void *sumohandle;
+	void *sumohandle;		/* TODO - remove this, its not ued anywhere (Campbell) */
 	
 	struct GameFraming framing;
 

Modified: trunk/blender/source/blender/makesdna/DNA_world_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_world_types.h	2007-07-18 21:16:07 UTC (rev 11311)
+++ trunk/blender/source/blender/makesdna/DNA_world_types.h	2007-07-19 00:42:01 UTC (rev 11312)
@@ -55,6 +55,7 @@
 	short colormodel, totex;
 	short texact, mistype;
 	
+	/* TODO - hork, zenk and ambk are not used, should remove at some point (Campbell) */
 	float horr, horg, horb, hork;
 	float zenr, zeng, zenb, zenk;
 	float ambr, ambg, ambb, ambk;

Modified: trunk/blender/source/blender/src/header_view3d.c
===================================================================
--- trunk/blender/source/blender/src/header_view3d.c	2007-07-18 21:16:07 UTC (rev 11311)
+++ trunk/blender/source/blender/src/header_view3d.c	2007-07-19 00:42:01 UTC (rev 11312)
@@ -2589,6 +2589,8 @@
 	return block;
 }
 
+extern void editmesh_mark_sharp(int set); /* declared in editmesh_mods.c */
+
 void do_view3d_edit_mesh_edgesmenu(void *arg, int event)
 {
 	float fac;





More information about the Bf-blender-cvs mailing list