[Bf-blender-cvs] [e98652b64f2] blender2.8: Cleanup: minor edits

[Campbell Barton]

Commit: e98652b64f2b38b9d1ee1371c33ad14ec600e297
Author: Campbell Barton
Date:   Mon May 22 16:20:54 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBe98652b64f2b38b9d1ee1371c33ad14ec600e297

Cleanup: minor edits

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

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 c0fe58ec5d9..6786e6c036b 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -1705,10 +1705,10 @@ void DRW_mesh_batch_cache_free(Mesh *me)
 
 /* Batch cache usage. */
 
-#define USE_COMP_MESH_DATA
 static VertexBuffer *mesh_batch_cache_get_tri_shading_data(MeshRenderData *rdata, MeshBatchCache *cache)
 {
 	BLI_assert(rdata->types & (MR_DATATYPE_VERT | MR_DATATYPE_LOOPTRI | MR_DATATYPE_LOOP | MR_DATATYPE_POLY));
+#define USE_COMP_MESH_DATA
 
 	if (cache->shaded_triangles_data == NULL) {
 		unsigned int vidx = 0;
@@ -1844,6 +1844,9 @@ static VertexBuffer *mesh_batch_cache_get_tri_shading_data(MeshRenderData *rdata
 		MEM_freeN(vcol_id);
 		MEM_freeN(tangent_id);
 	}
+
+#undef USE_COMP_MESH_DATA
+
 	return cache->shaded_triangles_data;
 }
 
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 89e085423d4..21f5ad97b3d 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -107,13 +107,6 @@ typedef struct OBJECT_Data {
 	OBJECT_StorageList *stl;
 } OBJECT_Data;
 
-/* per-image shading groups for image-type empty objects */
-struct EmptyImageShadingGroupData {
-	DRWShadingGroup *shgrp_image;
-	DRWShadingGroup *shgrp_wire;
-	float image_aspect[2];
-};
-
 /* *********** STATIC *********** */
 
 typedef struct OBJECT_PrivateData{
@@ -540,8 +533,15 @@ static void image_calc_aspect(Image *ima, ImageUser *iuser, float r_image_aspect
 	}
 }
 
+/* per-image shading groups for image-type empty objects */
+struct EmptyImageShadingGroupData {
+	DRWShadingGroup *shgrp_image;
+	DRWShadingGroup *shgrp_wire;
+	float image_aspect[2];
+};
+
 static void DRW_shgroup_empty_image(
-        OBJECT_StorageList *stl, OBJECT_PassList *psl, Object *ob, float color[4])
+        OBJECT_StorageList *stl, OBJECT_PassList *psl, Object *ob, const float color[3])
 {
 	/* TODO: 'StereoViews', see draw_empty_image. */