Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

object drawing: only use halo-draw in object mode

Browse Source
This commit is contained in:
Campbell Barton
2015-02-14 22:26:20 +11:00
parent dd6edac803
commit cfa1fd1c1f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3675,6 +3675,12 @@ static void draw_mesh_object_outline(View3D *v3d, Object *ob, DerivedMesh *dm)
} }
} }
static bool object_is_halo(Scene *scene, Object *ob)
{
const Material *ma = give_current_material(ob, 1);
return (ma && (ma->material_type == MA_TYPE_HALO) && !BKE_scene_use_new_shading_nodes(scene));
}
static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base, static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base,
const char dt, const unsigned char ob_wire_col[4], const short dflag) const char dt, const unsigned char ob_wire_col[4], const short dflag)
{ {
@@ -3684,8 +3690,6 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
Object *ob = base->object; Object *ob = base->object;
#endif #endif
Mesh *me = ob->data; Mesh *me = ob->data;
Material *ma = give_current_material(ob, 1);
const bool hasHaloMat = (ma && (ma->material_type == MA_TYPE_HALO) && !BKE_scene_use_new_shading_nodes(scene));
eWireDrawMode draw_wire = OBDRAW_WIRE_OFF; eWireDrawMode draw_wire = OBDRAW_WIRE_OFF;
int /* totvert,*/ totedge, totface; int /* totvert,*/ totedge, totface;
DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask); DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask);
@@ -3721,7 +3725,9 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && v3d->drawtype >= OB_WIRE) == 0) if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && v3d->drawtype >= OB_WIRE) == 0)
draw_bounding_volume(ob, ob->boundtype); draw_bounding_volume(ob, ob->boundtype);
} }
else if (hasHaloMat || (totface == 0 && totedge == 0)) { else if ((totface == 0 && totedge == 0) ||
((!is_obact || (ob->mode == OB_MODE_OBJECT)) && object_is_halo(scene, ob)))
{
glPointSize(1.5); glPointSize(1.5);
dm->drawVerts(dm); dm->drawVerts(dm);
glPointSize(1.0); glPointSize(1.0);