[Bf-blender-cvs] [886966aa38a] blender2.8: Correct comment, we need wire_outline data in this case

[Campbell Barton]

Commit: 886966aa38a3a0c514fa0921245e616276baf88d
Author: Campbell Barton
Date:   Fri Apr 28 23:04:29 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB886966aa38a3a0c514fa0921245e616276baf88d

Correct comment, we need wire_outline data in this case

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

M	source/blender/draw/intern/draw_armature.c
M	source/blender/draw/intern/draw_cache.c
M	source/blender/draw/intern/draw_cache.h

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

diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index 9a4c996837f..ca3d8bfa717 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -122,7 +122,7 @@ static void DRW_shgroup_bone_custom_solid(const float (*bone_mat)[4], const floa
 static void DRW_shgroup_bone_custom_wire(const float (*bone_mat)[4], const float color[4], Object *custom)
 {
 	/* grr, not re-using instances! */
-	struct Batch *geom = DRW_cache_object_wire_get(custom);
+	struct Batch *geom = DRW_cache_object_wire_outline_get(custom);
 	if (geom) {
 		DRWShadingGroup *shgrp_geom_wire = shgroup_instance_objspace_wire(g_data.bone_wire, geom, g_data.ob->obmat);
 		DRW_shgroup_call_dynamic_add(shgrp_geom_wire, bone_mat, color);
diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c
index 0b859e18d29..864a95101cf 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -453,11 +453,10 @@ Batch *DRW_cache_screenspace_circle_get(void)
 /** \name Common Object API
  * \{ */
 
-Batch *DRW_cache_object_wire_get(Object *ob)
+Batch *DRW_cache_object_wire_outline_get(Object *ob)
 {
 	switch (ob->type) {
 		case OB_MESH:
-			/* TODO, return regular edges (fails with pose-mode custom drawing. needs investigation) */
 			return DRW_cache_mesh_wire_outline_get(ob);
 
 		/* TODO, should match 'DRW_cache_object_surface_get' */
diff --git a/source/blender/draw/intern/draw_cache.h b/source/blender/draw/intern/draw_cache.h
index 22ac997458c..2bfe40062f4 100644
--- a/source/blender/draw/intern/draw_cache.h
+++ b/source/blender/draw/intern/draw_cache.h
@@ -39,7 +39,7 @@ struct Batch *DRW_cache_single_line_endpoints_get(void);
 struct Batch *DRW_cache_screenspace_circle_get(void);
 
 /* Common Object */
-struct Batch *DRW_cache_object_wire_get(struct Object *ob);
+struct Batch *DRW_cache_object_wire_outline_get(struct Object *ob);
 struct Batch *DRW_cache_object_surface_get(struct Object *ob);
 struct Batch **DRW_cache_object_surface_material_get(struct Object *ob);