diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-05-13 14:04:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-05-13 14:04:04 +0400 |
| commit | 33120a18250ab088be663305ff8542a729f00cb4 (patch) | |
| tree | 2b2c1c73d6f53ecfc495fea830d0b672cbb3752d /source/blender/src | |
| parent | 4e59c3ec5347fa11b34d3795c0da3acc900a6594 (diff) | |
disabled drawing the 2d image cursor when painting, added copy bevel weight to the edge copy menu.
Diffstat (limited to 'source/blender/src')
| -rw-r--r-- | source/blender/src/drawimage.c | 5 | ||||
| -rw-r--r-- | source/blender/src/editmesh_mods.c | 12 |
2 files changed, 14 insertions, 3 deletions
diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c index d8e94bd2ff7..547de85e856 100644 --- a/source/blender/src/drawimage.c +++ b/source/blender/src/drawimage.c @@ -367,7 +367,10 @@ static void drawcursor_sima(float xuser_asp, float yuser_asp) int wi, hi; float w, h; - if (!G.obedit || !CustomData_has_layer(&G.editMesh->fdata, CD_MTFACE)) return; + if ( !G.obedit || /* only draw cursor in editmode */ + !CustomData_has_layer(&G.editMesh->fdata, CD_MTFACE) || /* must have UV's */ + (G.sima->image && G.sima->flag & SI_DRAWTOOL) /* cant be painting */ + ) return; transform_width_height_tface_uv(&wi, &hi); w = (((float)wi)/256.0f)*G.sima->zoom * xuser_asp; diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c index 15a678e0ecc..d5e34779173 100644 --- a/source/blender/src/editmesh_mods.c +++ b/source/blender/src/editmesh_mods.c @@ -1458,7 +1458,7 @@ void mesh_copy_menu(void) eed_act = (EditEdge*)ese->data; - ret= pupmenu("Copy Active Edge to Selected%t|Crease%x1|Length%x2"); + ret= pupmenu("Copy Active Edge to Selected%t|Crease%x1|Bevel Weight%x2|Length%x3"); if (ret<1) return; eed_len_act = VecLenf(eed_act->v1->co, eed_act->v2->co); @@ -1472,8 +1472,16 @@ void mesh_copy_menu(void) } } break; + case 2: /* copy bevel weight */ + for(eed=em->edges.first; eed; eed=eed->next) { + if (eed->f & SELECT && eed != eed_act && eed->bweight != eed_act->bweight) { + eed->bweight = eed_act->bweight; + change = 1; + } + } + break; - case 2: /* copy length */ + case 3: /* copy length */ for(eed=em->edges.first; eed; eed=eed->next) { if (eed->f & SELECT && eed != eed_act) { |