Commit: 9a78dc806b287e5e59a6cb3d91d587d9dcd63232
Author: Antonio Vazquez
Date: Sat Aug 24 13:09:35 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB9a78dc806b287e5e59a6cb3d91d587d9dcd63232
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/blenkernel/BKE_gpencil.h
source/blender/blenkernel/intern/gpencil_modifier.c
source/blender/draw/engines/gpencil/gpencil_cache_utils.c
source/blender/draw/engines/gpencil/gpencil_draw_utils.c
source/blender/draw/engines/gpencil/gpencil_engine.h
source/blender/makesdna/DNA_object_types.h
===================================================================
===================================================================
diff --cc source/blender/draw/engines/gpencil/gpencil_engine.h
index c3167e21f27,6c2c9583979..34aebc76232
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@@ -34,10 -34,11 +34,14 @@@ struct RenderEngine
struct RenderLayer;
struct bGPDstroke;
struct tGPspoint;
+struct GpencilBatchCache;
+struct GpencilBatchCacheElem;
+struct GpencilBatchGroup;
+ struct GPUBatch;
+ struct GPUVertBuf;
+ struct GPUVertFormat;
+
#define GPENCIL_CACHE_BLOCK_SIZE 8
#define GPENCIL_MAX_SHGROUPS 65536
#define GPENCIL_GROUPS_BLOCK_SIZE 1024
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
