diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-05-17 18:25:57 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-05-17 18:25:57 +0300 |
| commit | 3cff7768d5e919b60b42bac2182ff0efb130d720 (patch) | |
| tree | c76d8814a7a3c96283b467fbb7e82c82ad96ec1b /source/blender/editors | |
| parent | 43ee3f4040a41c637b6eceda4c3aa1046f8a13a5 (diff) | |
Fix T44718: Cycles GLSL not working for NURBS objects.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 5b2ac50216a..25557af5ddb 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -301,11 +301,12 @@ bool draw_glsl_material(Scene *scene, Object *ob, View3D *v3d, const char dt) if (v3d->flag2 & V3D_SHOW_SOLID_MATCAP) return true; - if (BKE_scene_use_new_shading_nodes(scene)) + if (v3d->drawtype == OB_TEXTURE) + return (scene->gm.matmode == GAME_MAT_GLSL && !BKE_scene_use_new_shading_nodes(scene)); + else if (v3d->drawtype == OB_MATERIAL && dt > OB_SOLID) + return true; + else return false; - - return ((scene->gm.matmode == GAME_MAT_GLSL && v3d->drawtype == OB_TEXTURE) || - (v3d->drawtype == OB_MATERIAL)) && (dt > OB_SOLID); } static bool check_alpha_pass(Base *base) |