diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-10-28 18:13:46 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-10-28 18:13:46 +0400 |
| commit | 55478b26165a27ef8de5ead51231f81d8a9142e1 (patch) | |
| tree | 55e05375a26b8fa6ae4010cc3e9bd50f02b9ac34 /source/blender/src | |
| parent | 3aa1d9432da4e01d30c5bb991800518bad30e9c6 (diff) | |
New 'visible only' select didnt work correct when parts of faces were
hidden. The drawing function needs to return the actual face total, not
the amount that was drawn
Diffstat (limited to 'source/blender/src')
| -rw-r--r-- | source/blender/src/drawobject.c | 2 | ||||
| -rw-r--r-- | source/blender/src/header_action.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 7575cab1bf1..f80f3d37739 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -4525,6 +4525,7 @@ static int bbs_mesh_solid(Object *ob, int facecol) // tuck original indices in efa->prev for(b=1, efa= G.editMesh->faces.first; efa; efa= efa->next, b++) efa->prev= (EditFace *)(b); + a= b+1; // correct return value, next loop excludes hidden faces for(b=0, mface= dlm->mface; b<dlm->totface; b++, mface++) { if(mface->v3) { @@ -4544,7 +4545,6 @@ static int bbs_mesh_solid(Object *ob, int facecol) for (prevefa= NULL, efa= G.editMesh->faces.first; efa; prevefa= efa, efa= efa->next) efa->prev= prevefa; - a= b+1; } else { a= 1; diff --git a/source/blender/src/header_action.c b/source/blender/src/header_action.c index 00d18b27afe..358b346304f 100644 --- a/source/blender/src/header_action.c +++ b/source/blender/src/header_action.c @@ -748,7 +748,9 @@ void action_buttons(void) uiBlockSetEmboss(block, UI_EMBOSSX); // object action is allowed to be zero! - if (!get_action_mesh_key()) { + /* (ton) commented out below line, since people can apparently link Action to any object (mesh) and + not unlink anymore when theres a mesh key. Needs to be rethought this stuff! */ + //if (!get_action_mesh_key()) { /* NAME ETC */ ob=OBACT; @@ -768,7 +770,7 @@ void action_buttons(void) "converted into Ipo keys"); xco+=64; - } + //} uiClearButLock(); /* draw LOCK */ |