Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2008-03-26 19:06:25 +0300
committerCampbell Barton <ideasman42@gmail.com>2008-03-26 19:06:25 +0300
commit4197e37200518e18d251a2f43cb9e5e39b6f2d02 (patch)
treecc37b25fc2130d4870bbb54a72ffd8d846ac587a /source/blender/src/drawobject.c
parentb46bad83bfcf257735925d2f7cee4557e7488fa8 (diff)
made editmode face copy menu appier with when there is no active face (without options that required an active face)
active face drawing didnt always work since it used the last selected element for drawing. moved stipple into glutil.c rather then using 128 bytes in the stack for each stipple draw.
Diffstat (limited to 'source/blender/src/drawobject.c')
-rw-r--r--source/blender/src/drawobject.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index 9ddf5e405dd..e3c11c80468 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -2061,15 +2061,16 @@ static int draw_em_fancy__setFaceOpts(void *userData, int index, int *drawSmooth
static void draw_em_fancy(Object *ob, EditMesh *em, DerivedMesh *cageDM, DerivedMesh *finalDM, int dt)
{
Mesh *me = ob->data;
- EditFace *efa_act = NULL;
+ EditFace *efa_act = EM_get_actFace(); /* annoying but active faces is stored differently */
EditEdge *eed_act = NULL;
EditVert *eve_act = NULL;
if (G.editMesh->selected.last) {
EditSelection *ese = G.editMesh->selected.last;
- if ( ese->type == EDITFACE ) {
+ /* face is handeled above */
+ /*if (ese->type == EDITFACE ) {
efa_act = (EditFace *)ese->data;
- } else if ( ese->type == EDITEDGE ) {
+ } else */ if ( ese->type == EDITEDGE ) {
eed_act = (EditEdge *)ese->data;
} else if ( ese->type == EDITVERT ) {
eve_act = (EditVert *)ese->data;