[Bf-blender-cvs] [b8df9f65317] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

Antonio Vazquez noreply at git.blender.org
Wed Jun 28 13:21:20 CEST 2017


Commit: b8df9f653178f356565d5beb8d7a979b2405420d
Author: Antonio Vazquez
Date:   Wed Jun 28 13:15:04 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb8df9f653178f356565d5beb8d7a979b2405420d

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/draw/intern/draw_cache_impl.h
index bf5879b6572,9328f6f6314..1684a62add1
--- a/source/blender/draw/intern/draw_cache_impl.h
+++ b/source/blender/draw/intern/draw_cache_impl.h
@@@ -26,8 -26,8 +26,9 @@@
  #ifndef __DRAW_CACHE_IMPL_H__
  #define __DRAW_CACHE_IMPL_H__
  
 +struct bGPdata;
  struct Gwn_Batch;
+ struct GPUMaterial;
  struct ListBase;
  struct CurveCache;
  struct ParticleSystem;




More information about the Bf-blender-cvs mailing list