Revision: 23691 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23691 Author: campbellbarton Date: 2009-10-07 17:16:08 +0200 (Wed, 07 Oct 2009)
Log Message: ----------- Making new faces (fkey, scanfill etc) didnt create faces with the active material. Keep the editmesh material and active material in sync Modified Paths: -------------- trunk/blender/source/blender/editors/mesh/editmesh.c trunk/blender/source/blender/makesrna/intern/rna_object.c Modified: trunk/blender/source/blender/editors/mesh/editmesh.c =================================================================== --- trunk/blender/source/blender/editors/mesh/editmesh.c 2009-10-07 14:48:29 UTC (rev 23690) +++ trunk/blender/source/blender/editors/mesh/editmesh.c 2009-10-07 15:16:08 UTC (rev 23691) @@ -986,6 +986,8 @@ CustomData_add_layer(&me->fdata, CD_MFACE, CD_ASSIGN, mface, me->totface); mesh_update_customdata_pointers(me); + em->mat_nr= ob->actcol-1; + /* the vertices, use ->tmp.l as counter */ eve= em->verts.first; a= 0; Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c =================================================================== --- trunk/blender/source/blender/makesrna/intern/rna_object.c 2009-10-07 14:48:29 UTC (rev 23690) +++ trunk/blender/source/blender/makesrna/intern/rna_object.c 2009-10-07 15:16:08 UTC (rev 23691) @@ -99,6 +99,8 @@ #include "BKE_particle.h" #include "BKE_scene.h" +#include "BLI_editVert.h" /* for EditMesh->mat_nr */ + #include "ED_object.h" void rna_Object_update(bContext *C, PointerRNA *ptr) @@ -404,6 +406,13 @@ { Object *ob= (Object*)ptr->id.data; ob->actcol= value+1; + + if(ob->mode==OB_MODE_EDIT && ob->type==OB_MESH) { + Mesh *me= ob->data; + + if(me->edit_mesh) + me->edit_mesh->mat_nr= value; + } } static void rna_Object_active_material_index_range(PointerRNA *ptr, int *min, int *max) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs