[Bf-blender-cvs] [87492f93a41] tmp-vulkan: Merge commit 'master@{5-weeks-ago}' into tmp-vulkan

[Jeroen Bakker]

Commit: 87492f93a41b47ce3238854e9bea6e88c7bbc30d
Author: Jeroen Bakker
Date:   Mon Jun 28 14:06:20 2021 +0200
Branches: tmp-vulkan
https://developer.blender.org/rB87492f93a41b47ce3238854e9bea6e88c7bbc30d

Merge commit 'master@{5-weeks-ago}' into tmp-vulkan

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



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

diff --cc source/blender/draw/intern/draw_cache_impl.h
index d129d057901,2c2ab9eaadd..c05ca3c2f15
--- a/source/blender/draw/intern/draw_cache_impl.h
+++ b/source/blender/draw/intern/draw_cache_impl.h
@@@ -22,10 -22,6 +22,12 @@@
  
  #pragma once
  
++#include "BKE_mesh_types.h"
++
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
 +
  struct GPUBatch;
  struct GPUIndexBuf;
  struct GPUMaterial;
@@@ -45,8 -41,12 +47,6 @@@ struct PointCloud
  struct Volume;
  struct bGPdata;
  
--#include "BKE_mesh_types.h"
 -
 -#ifdef __cplusplus
 -extern "C" {
 -#endif
--
  /* Expose via BKE callbacks */
  void DRW_mball_batch_cache_dirty_tag(struct MetaBall *mb, int mode);
  void DRW_mball_batch_cache_validate(struct MetaBall *mb);