[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45442] trunk/blender/source/blender/ blenkernel/intern/modifiers_bmesh.c: Fix [#30832] Weight on Bevel modifier has no effect for edges with weight.

Francisco De La Cruz dlcs.frank at gmail.com
Fri Apr 6 13:24:43 CEST 2012


Revision: 45442
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45442
Author:   xercesblue
Date:     2012-04-06 11:24:42 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
Fix [#30832] Weight on Bevel modifier has no effect for edges with weight.

Added missing CD_BWEIGHT layer for the modifier's DerivedMesh.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c

Modified: trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c	2012-04-06 10:57:22 UTC (rev 45441)
+++ trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c	2012-04-06 11:24:42 UTC (rev 45442)
@@ -68,6 +68,9 @@
 
 	/* add crease layer */
 	BM_data_layer_add(bm, &bm->edata, CD_CREASE);
+	/* add bevel weight layers */
+	BM_data_layer_add(bm, &bm->edata, CD_BWEIGHT);
+	BM_data_layer_add(bm, &bm->vdata, CD_BWEIGHT);
 
 	vtable = MEM_callocN(sizeof(void**) * totvert, "vert table in BMDM_Copy");
 	etable = MEM_callocN(sizeof(void**) * totedge, "edge table in BMDM_Copy");
@@ -80,6 +83,9 @@
 		v->head.hflag = BM_vert_flag_from_mflag(mv->flag);
 
 		CustomData_to_bmesh_block(&dm->vertData, &bm->vdata, i, &v->head.data);
+
+		/* add bevel weight */
+		BM_elem_float_data_set(&bm->vdata, v, CD_BWEIGHT, (float)mv->bweight / 255.0f);
 		vtable[i] = v;
 	}
 	MEM_freeN(mvert);
@@ -96,6 +102,8 @@
 
 		/* add crease */
 		BM_elem_float_data_set(&bm->edata, e, CD_CREASE, (float)me->crease / 255.0f);
+		/* add bevel weight */
+		BM_elem_float_data_set(&bm->edata, e, CD_BWEIGHT, (float)me->bweight / 255.0f);
 	}
 	MEM_freeN(medge);
 




More information about the Bf-blender-cvs mailing list