[Bf-blender-cvs] [e30d64cfc1e] greasepencil-object: Merge branch 'master' into greasepencil-object

Antonio Vazquez noreply at git.blender.org
Sun Aug 25 17:13:57 CEST 2019


Commit: e30d64cfc1e485285657b728b6f05366cc51b16d
Author: Antonio Vazquez
Date:   Sun Aug 25 17:09:11 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBe30d64cfc1e485285657b728b6f05366cc51b16d

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/draw/engines/gpencil/gpencil_engine.h

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



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

diff --cc source/blender/draw/engines/gpencil/gpencil_engine.h
index 34aebc76232,ed71cdbb9e8..04cb3f8f992
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@@ -33,11 -32,7 +32,6 @@@ struct Object
  struct RenderEngine;
  struct RenderLayer;
  struct bGPDstroke;
- struct tGPspoint;
- struct GpencilBatchCache;
- struct GpencilBatchCacheElem;
- struct GpencilBatchGroup;
--
  struct GPUBatch;
  struct GPUVertBuf;
  struct GPUVertFormat;



More information about the Bf-blender-cvs mailing list