[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14825] trunk/blender/source/blender/src: disabled drawing the 2d image cursor when painting, added copy bevel weight to the edge copy menu.

[Campbell Barton]

Revision: 14825
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14825
Author:   campbellbarton
Date:     2008-05-13 12:04:04 +0200 (Tue, 13 May 2008)

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

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawimage.c
    trunk/blender/source/blender/src/editmesh_mods.c

Modified: trunk/blender/source/blender/src/drawimage.c
===================================================================
--- trunk/blender/source/blender/src/drawimage.c        2008-05-13 06:12:33 UTC 
(rev 14824)
+++ trunk/blender/source/blender/src/drawimage.c        2008-05-13 10:04:04 UTC 
(rev 14825)
@@ -367,7 +367,10 @@
        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;

Modified: trunk/blender/source/blender/src/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/src/editmesh_mods.c    2008-05-13 06:12:33 UTC 
(rev 14824)
+++ trunk/blender/source/blender/src/editmesh_mods.c    2008-05-13 10:04:04 UTC 
(rev 14825)
@@ -1458,7 +1458,7 @@
                
                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 @@
                                }
                        }
                        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) {


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs