kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix [#29256] Import images as planes add on doesn't work correctly in bmesh

Browse Source
This commit is contained in:
Campbell Barton 2011-11-24 22:40:43 +00:00
parent 4b3976cc5a
commit 2d71eab5aa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/gpu/intern/gpu_buffers.c
View File

@ -676,7 +676,7 @@ static void GPU_buffer_copy_uv(DerivedMesh *dm, float *varray, int *index, int *
MTFace *mtface; MTFace *mtface;
MFace *f; MFace *f;
if(!(mtface = DM_get_face_data_layer(dm, CD_MTFACE))) if(!(mtface = DM_get_tessface_data_layer(dm, CD_MTFACE)))
return; return;
f = dm->getTessFaceArray(dm); f = dm->getTessFaceArray(dm);
@ -780,7 +780,7 @@ static void GPU_buffer_copy_edge(DerivedMesh *dm, float *varray_, int *UNUSED(in
static void GPU_buffer_copy_uvedge(DerivedMesh *dm, float *varray, int *UNUSED(index), int *UNUSED(mat_orig_to_new), void *UNUSED(user)) 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; int i, j=0;
if(!tf) if(!tf)
@ -819,13 +819,13 @@ static MCol *gpu_buffer_color_type(DerivedMesh *dm)
int type; int type;
type = CD_ID_MCOL; type = CD_ID_MCOL;
c = DM_get_face_data_layer(dm, type); c = DM_get_tessface_data_layer(dm, type);
if(!c) { if(!c) {
type = CD_WEIGHT_MCOL; type = CD_WEIGHT_MCOL;
c = DM_get_face_data_layer(dm, type); c = DM_get_tessface_data_layer(dm, type);
if(!c) { if(!c) {
type = CD_MCOL; type = CD_MCOL;
c = DM_get_face_data_layer(dm, type); c = DM_get_tessface_data_layer(dm, type);
} }
} }
@ -919,7 +919,7 @@ static GPUBuffer *gpu_buffer_setup_type(DerivedMesh *dm, GPUBufferType type)
return NULL; return NULL;
} }
else if(type == GPU_BUFFER_UV) { 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; return NULL;
} }