bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

disabled drawing the 2d image cursor when painting, added copy bevel weight to the edge copy menu.

Browse Source
This commit is contained in:
Campbell Barton 2008-05-13 10:04:04 +00:00
parent 4e59c3ec53
commit 33120a1825
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/src/drawimage.c
View File

@ -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;

12
source/blender/src/editmesh_mods.c
View File

@ -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) {