Revision: 35987
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35987
Author: campbellbarton
Date: 2011-04-04 04:47:18 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
remove unused DNA from mesh, effects list & cubemap size.
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/makesdna/DNA_mesh_types.h
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-04-04
04:14:25 UTC (rev 35986)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-04-04
04:47:18 UTC (rev 35987)
@@ -6941,13 +6941,6 @@
sc= sc->id.next;
}
}
- if(main->versionfile <= 112) {
- Mesh *me = main->mesh.first;
- while(me) {
- me->cubemapsize= 1.0;
- me= me->id.next;
- }
- }
if(main->versionfile <= 113) {
Material *ma = main->mat.first;
while(ma) {
Modified: trunk/blender/source/blender/makesdna/DNA_mesh_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_mesh_types.h 2011-04-04
04:14:25 UTC (rev 35986)
+++ trunk/blender/source/blender/makesdna/DNA_mesh_types.h 2011-04-04
04:47:18 UTC (rev 35987)
@@ -58,8 +58,6 @@
struct AnimData *adt; /* animation data (must be immediately
after id for utilities to use it) */
struct BoundBox *bb;
-
- ListBase effect;
struct Ipo *ipo; // XXX depreceated... old animation
system
struct Key *key;
@@ -87,22 +85,20 @@
* of the last selected face and is similar to the old active face flag
where
* the face does not need to be selected, -1 is inactive */
int act_face;
-
- short texflag, editflag;
-
+
/* texture space, copied as one block in editobject.c */
float loc[3];
float size[3];
float rot[3];
-
- float cubemapsize;
-
- int drawflag;
+
+ short texflag, drawflag;
short smoothresh, flag;
short subdiv, subdivr;
+ char subsurftype; /* only kept for backwards compat, not
used anymore */
+ char editflag;
+
short totcol;
- short subsurftype; /* only kept for backwards compat, not
used anymore */
struct Multires *mr; /* Multiresolution modeling data */
struct PartialVisibility *pv;
@@ -128,7 +124,7 @@
#define ME_EDIT_MIRROR_Z (1 << 2) // unused so far
#define ME_EDIT_PAINT_MASK (1 << 3)
-#define ME_EDIT_MIRROR_TOPO (1 << 4) // unused so far
+#define ME_EDIT_MIRROR_TOPO (1 << 4)
/* me->flag */
@@ -143,7 +139,7 @@
#define ME_OPT_EDGES 256
#define ME_DS_EXPAND 512
-/* me->drawflag, int */
+/* me->drawflag, short */
#define ME_DRAWEDGES (1 << 0)
#define ME_DRAWFACES (1 << 1)
#define ME_DRAWNORMALS (1 << 2)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
