[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42147] branches/bmesh/blender/source/ blender/gpu/intern/gpu_buffers.c: fix [#29256] Import images as planes add on doesn't work correctly in bmesh

[Campbell Barton]

Revision: 42147
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42147
Author:   campbellbarton
Date:     2011-11-24 22:40:43 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
fix [#29256] Import images as planes add on doesn't work correctly in bmesh

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/gpu/intern/gpu_buffers.c

Modified: branches/bmesh/blender/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- branches/bmesh/blender/source/blender/gpu/intern/gpu_buffers.c      
2011-11-24 22:24:07 UTC (rev 42146)
+++ branches/bmesh/blender/source/blender/gpu/intern/gpu_buffers.c      
2011-11-24 22:40:43 UTC (rev 42147)
@@ -676,7 +676,7 @@
        MTFace *mtface;
        MFace *f;
 
-       if(!(mtface = DM_get_face_data_layer(dm, CD_MTFACE)))
+       if(!(mtface = DM_get_tessface_data_layer(dm, CD_MTFACE)))
                return;
        f = dm->getTessFaceArray(dm);
                
@@ -780,7 +780,7 @@
 
 static void GPU_buffer_copy_uvedge(DerivedMesh *dm, float *varray, int 
*UNUSED(index), int *UNUSED(mat_orig_to_new), void *UNUSED(user))
 {
-       MTFace *tf = DM_get_face_data_layer(dm, CD_MTFACE);
+       MTFace *tf = DM_get_tessface_data_layer(dm, CD_MTFACE);
        int i, j=0;
 
        if(!tf)
@@ -819,13 +819,13 @@
        int type;
 
        type = CD_ID_MCOL;
-       c = DM_get_face_data_layer(dm, type);
+       c = DM_get_tessface_data_layer(dm, type);
        if(!c) {
                type = CD_WEIGHT_MCOL;
-               c = DM_get_face_data_layer(dm, type);
+               c = DM_get_tessface_data_layer(dm, type);
                if(!c) {
                        type = CD_MCOL;
-                       c = DM_get_face_data_layer(dm, type);
+                       c = DM_get_tessface_data_layer(dm, type);
                }
        }
 
@@ -919,7 +919,7 @@
                        return NULL;
        }
        else if(type == GPU_BUFFER_UV) {
-               if(!DM_get_face_data_layer(dm, CD_MTFACE))
+               if(!DM_get_tessface_data_layer(dm, CD_MTFACE))
                        return NULL;
        }
 

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