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

Material not set in edit derived meshes after last material modification

Browse Source 
commits.
This commit is contained in:
Antony Riakiotakis 2014-11-28 14:29:56 +01:00
parent c979f2656d
commit c9675b460e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/editderivedmesh.c
View File

@ -56,6 +56,7 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "GPU_extensions.h" #include "GPU_extensions.h"
#include "GPU_draw.h"
#include "GPU_glew.h" #include "GPU_glew.h"
extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */ extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */
@ -607,13 +608,17 @@ static void emDM_drawMappedFaces(DerivedMesh *dm,
int drawSmooth; int drawSmooth;
efa = ltri[0]->f; efa = ltri[0]->f;
drawSmooth = lnors || ((flag & DM_DRAW_ALWAYS_SMOOTH) ? 1 : BM_elem_flag_test(efa, BM_ELEM_SMOOTH)); drawSmooth = lnors || ((flag & DM_DRAW_ALWAYS_SMOOTH) ? 1 : BM_elem_flag_test(efa, BM_ELEM_SMOOTH));
draw_option = (!setDrawOptions ? draw_option = (!setDrawOptions ?
DM_DRAW_OPTION_NORMAL : DM_DRAW_OPTION_NORMAL :
setDrawOptions(userData, BM_elem_index_get(efa))); setDrawOptions(userData, BM_elem_index_get(efa)));
if (draw_option != DM_DRAW_OPTION_SKIP) { if (draw_option != DM_DRAW_OPTION_SKIP) {
const GLenum poly_type = GL_TRIANGLES; /* BMESH NOTE, this is odd but keep it for now to match trunk */ const GLenum poly_type = GL_TRIANGLES; /* BMESH NOTE, this is odd but keep it for now to match trunk */
GPU_enable_material(efa->mat_nr + 1, NULL);
if (draw_option == DM_DRAW_OPTION_STIPPLE) { /* enabled with stipple */ if (draw_option == DM_DRAW_OPTION_STIPPLE) { /* enabled with stipple */
if (poly_prev != GL_ZERO) glEnd(); if (poly_prev != GL_ZERO) glEnd();