[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42101] branches/bmesh/blender/source/ blender/blenkernel/intern/cdderivedmesh.c: fix for vertex paint and face mask selection - drawing was using CD_ORIGINDEX when it should use CD_POLYINDEX

[Campbell Barton]

Revision: 42101
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42101
Author:   campbellbarton
Date:     2011-11-23 18:13:12 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
fix for vertex paint and face mask selection - drawing was using CD_ORIGINDEX 
when it should use CD_POLYINDEX

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c

Modified: 
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c     
2011-11-23 17:48:55 UTC (rev 42100)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c     
2011-11-23 18:13:12 UTC (rev 42101)
@@ -686,7 +686,7 @@
        MCol *realcol = dm->getTessFaceDataArray(dm, CD_TEXTURE_MCOL);
        float *nors= dm->getTessFaceDataArray(dm, CD_NORMAL);
        MTFace *tf = DM_get_tessface_data_layer(dm, CD_MTFACE);
-       int i, j, orig, *index = DM_get_tessface_data_layer(dm, CD_ORIGINDEX);
+       int i, j, orig, *index = DM_get_tessface_data_layer(dm, CD_POLYINDEX);
        int startFace = 0, lastFlag = 0xdeadbeef;
        MCol *mcol = dm->getTessFaceDataArray(dm, CD_WEIGHT_MCOL);
        if(!mcol)
@@ -878,7 +878,7 @@
        MFace *mf = cddm->mface;
        MCol *mc;
        float *nors= DM_get_tessface_data_layer(dm, CD_NORMAL);
-       int i, orig, *index = DM_get_tessface_data_layer(dm, CD_ORIGINDEX);
+       int i, orig, *index = DM_get_tessface_data_layer(dm, CD_POLYINDEX);
 
        mc = DM_get_tessface_data_layer(dm, CD_ID_MCOL);
        if(!mc)
@@ -1105,7 +1105,7 @@
        /* MTFace *tf = dm->getTessFaceDataArray(dm, CD_MTFACE); */ /* UNUSED */
        float (*nors)[3] = dm->getTessFaceDataArray(dm, CD_NORMAL);
        int a, b, dodraw, matnr, new_matnr;
-       int orig, *index = dm->getTessFaceDataArray(dm, CD_ORIGINDEX);
+       int orig, *index = dm->getTessFaceDataArray(dm, CD_POLYINDEX);
 
        cdDM_update_normals_from_pbvh(dm);
 
@@ -1401,7 +1401,7 @@
        MFace *mf = cddm->mface;
        float (*nors)[3] = dm->getTessFaceDataArray(dm, CD_NORMAL);
        int a, matnr, new_matnr;
-       int orig, *index = dm->getTessFaceDataArray(dm, CD_ORIGINDEX);
+       int orig, *index = dm->getTessFaceDataArray(dm, CD_POLYINDEX);
 
        cdDM_update_normals_from_pbvh(dm);
 

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