diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-19 15:31:31 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-19 15:31:31 +0400 |
| commit | 7b2101ace983cc9d7112dd45a8b264b51657dea9 (patch) | |
| tree | c1d75f2ae3f30fe9de51c1c7332e862064a93193 /source/blender/editors/space_view3d/drawmesh.c | |
| parent | 787ea5feb4a80babccd86689b066153ac57db91c (diff) | |
| parent | a87c5eb52cd4951b138f518bf12d498bc5e5eb8a (diff) | |
svn merge ^/trunk/blender -r43482:43524
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index f2c8fafb8b8..061a9f5a300 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -352,11 +352,8 @@ static void draw_textured_begin(Scene *scene, View3D *v3d, RegionView3D *rv3d, O Gtexdraw.islit= GPU_scene_object_lights(scene, ob, v3d->lay, rv3d->viewmat, !rv3d->is_persp); } - obcol[0]= CLAMPIS(ob->col[0]*255, 0, 255); - obcol[1]= CLAMPIS(ob->col[1]*255, 0, 255); - obcol[2]= CLAMPIS(ob->col[2]*255, 0, 255); - obcol[3]= CLAMPIS(ob->col[3]*255, 0, 255); - + rgba_float_to_uchar(obcol, ob->col); + glCullFace(GL_BACK); glEnable(GL_CULL_FACE); if(solidtex || v3d->drawtype==OB_TEXTURE) istex= 1; else istex= 0; |