[Bf-blender-cvs] [390648b9847] blender2.8: DwM: Show wire only mesh objects

[Campbell Barton]

Commit: 390648b98473851c5cdff88aca5ba72aa57151e4
Author: Campbell Barton
Date:   Thu Jun 1 02:26:24 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB390648b98473851c5cdff88aca5ba72aa57151e4

DwM: Show wire only mesh objects

===================================================================

M	source/blender/draw/intern/draw_cache_impl_mesh.c
M	source/blender/draw/modes/object_mode.c

===================================================================

diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 70135389a8d..7c530e53ac1 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -2422,7 +2422,6 @@ static ElementList *mesh_batch_cache_get_edges_in_order(MeshRenderData *rdata, M
 	BLI_assert(rdata->types & (MR_DATATYPE_VERT | MR_DATATYPE_EDGE));
 
 	if (cache->edges_in_order == NULL) {
-		printf("Caching edges in order...\n");
 		const int vert_len = mesh_render_data_verts_len_get(rdata);
 		const int edge_len = mesh_render_data_edges_len_get(rdata);
 
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 205a0c16613..8abe59b1cbf 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -30,6 +30,7 @@
 #include "DNA_armature_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_curve_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_object_force.h"
 #include "DNA_particle_types.h"
 #include "DNA_view3d_types.h"
@@ -1526,8 +1527,26 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
 
 	switch (ob->type) {
 		case OB_MESH:
+		{
+			Mesh *me = ob->data;
+			if (me->totpoly == 0) {
+				Object *obedit = scene->obedit;
+				if (ob != obedit) {
+					struct Batch *geom = DRW_cache_mesh_edges_get(ob);
+					if (geom) {
+						if (theme_id == TH_UNDEFINED) {
+							theme_id = DRW_object_wire_theme_get(ob, sl, NULL);
+						}
+
+						DRWShadingGroup *shgroup = shgroup_theme_id_to_wire_or(stl, theme_id, stl->g_data->wire);
+						DRW_shgroup_call_add(shgroup, geom, ob->obmat);
+					}
+				}
+			}
+
 			OBJECT_cache_populate_particles(ob, psl);
 			break;
+		}
 		case OB_SURF:
 			break;
 		case OB_LATTICE: