diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-07-09 02:41:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-07-09 02:41:12 +0400 |
| commit | 8ab1fadf3d7a987cbdf378162570e9dc658b74ec (patch) | |
| tree | 405579c15fa0f7ad22d1573cc2a7ed7ab46cdc28 /source/blender/editors/space_view3d/drawobject.c | |
| parent | 751062fc5fea7a17e9a1656391c841a6489194b2 (diff) | |
Fix #36063: cycles 3D viewport was incorrectly influenced by blender internal
material halo settings.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index d3cf7ae9eea..d5ecdaf0596 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -3273,7 +3273,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D Object *ob = base->object; Mesh *me = ob->data; Material *ma = give_current_material(ob, 1); - const short hasHaloMat = (ma && (ma->material_type == MA_TYPE_HALO)); + const short hasHaloMat = (ma && (ma->material_type == MA_TYPE_HALO) && !BKE_scene_use_new_shading_nodes(scene)); eWireDrawMode draw_wire = OBDRAW_WIRE_OFF; int /* totvert,*/ totedge, totface; DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask); |