archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- removed duplicate flags from BKE_mesh.h

Browse Source 
- removed rendermesh_uses_displist (no longer relevant)
 - converted appropriate me->flag tests to using mesh_uses_displist
 - made vert and face counting (for info header) use proper counts
 - changed flip_subdivision to allow level==0 argument
 - ps. thanks for subsurf orco fix ton
This commit is contained in:
Daniel Dunbar
2004-01-08 04:42:29 +00:00
parent 86e32ddcc8
commit f6f06ba54d
8 changed files with 28 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/src/editobject.c
View File

@@ -1670,7 +1670,7 @@ void convertmenu(void)
nr= pupmenu("Convert Nurbs Surf to%t|Mesh");
if(nr>0) ok= 1;
}
else if(ob->type==OB_MESH && ((Mesh*) ob->data)->flag&ME_SUBSURF) {
else if(ob->type==OB_MESH && mesh_uses_displist((Mesh*) ob->data)) {
nr= pupmenu("Convert SubSurf to%t|Mesh (keep original)");
if(nr>0) ok= 1;
}
@@ -1697,10 +1697,7 @@ void convertmenu(void)
else if(ob->type==OB_MESH) {
Mesh *oldme= ob->data;
if( oldme->subdiv==0 ) {
error("No subdivision Mesh to convert available");
}
else if (oldme->flag&ME_SUBSURF) {
if (mesh_uses_displist(oldme)) {
DispListMesh *dlm;
ob->flag |= OB_DONE;
@@ -1819,18 +1816,15 @@ void convertmenu(void)
allqueue(REDRAWBUTSEDIT, 0);
}
/* Change subdivision properties of mesh object ob, if
* level==-1 then toggle subsurf, else set to level.
*/
void flip_subdivison(Object *ob, int level)
{
Mesh *me;
Mesh *me = ob->data;
me = ob->data;
if (level == 0)
{
if(me->flag & ME_SUBSURF)
me->flag &= ~ME_SUBSURF;
else
me->flag |= ME_SUBSURF;
if (level == -1) {
me->flag ^= ME_SUBSURF;
} else {
me->subdiv = level;
}