archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #23754: glsl + constructive curve modifier not drawing correct.

Browse Source
This commit is contained in:
Brecht Van Lommel
2010-09-20 21:57:29 +00:00
parent 2ac17c4c23
commit efbda5c53e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/space_view3d/drawobject.c
View File

@@ -3075,12 +3075,15 @@ static int drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d, B
int glsl = draw_glsl_material(scene, ob, v3d, dt); int glsl = draw_glsl_material(scene, ob, v3d, dt);
GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL); GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
if (!glsl) if(!glsl) {
glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 0); glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 0);
glEnable(GL_LIGHTING);
dm->drawFacesSolid(dm, NULL, 0, GPU_enable_material);
glDisable(GL_LIGHTING);
}
else
dm->drawFacesGLSL(dm, GPU_enable_material);
glEnable(GL_LIGHTING);
dm->drawFacesSolid(dm, NULL, 0, GPU_enable_material);
glDisable(GL_LIGHTING);
GPU_end_object_materials(); GPU_end_object_materials();
} else { } else {
if((v3d->flag2 & V3D_RENDER_OVERRIDE && v3d->drawtype >= OB_SOLID)==0) if((v3d->flag2 & V3D_RENDER_OVERRIDE && v3d->drawtype >= OB_SOLID)==0)