Merging r58073 through r58111 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / editors / space_view3d / drawobject.c
index eeacaab464c181d6d848757fd66cd49c1cf8eb93..cef4e1880ab99b07ef84b43adc922f97c10aca0a 100644 (file)
@@ -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);