disabled drawing the 2d image cursor when painting, added copy bevel weight to the...
authorCampbell Barton <ideasman42@gmail.com>
Tue, 13 May 2008 10:04:04 +0000 (10:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 13 May 2008 10:04:04 +0000 (10:04 +0000)
source/blender/src/drawimage.c
source/blender/src/editmesh_mods.c

index d8e94bd2ff7bbc7589de5373c391f6dae4580d4f..547de85e8562833dc1faf4c520605b8369dcd23d 100644 (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;
index 15a678e0eccc6f4dfeaf1545b41b9543599abc84..d5e34779173b68789ee6dc5efdfc01163d6eec21 100644 (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) {