[Bf-blender-cvs] [966d4a668c3] temp-lineart-contained: Merge remote-tracking branch 'origin/master' into temp-lineart-contained

[YimingWu]

Commit: 966d4a668c30593c1e5bb61a31edabee50867248
Author: YimingWu
Date:   Sat Jul 17 19:43:26 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB966d4a668c30593c1e5bb61a31edabee50867248

Merge remote-tracking branch 'origin/master' into temp-lineart-contained

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index b451bcb1e22,313ce734bbc..849b2f1f35b
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -30,12 -30,10 +30,13 @@@
  #include "DNA_brush_types.h"
  #include "DNA_collection_types.h"
  #include "DNA_genfile.h"
 +#include "DNA_gpencil_modifier_types.h"
 +#include "DNA_lineart_types.h"
  #include "DNA_listBase.h"
 +#include "DNA_material_types.h"
  #include "DNA_modifier_types.h"
  #include "DNA_text_types.h"
+ #include "DNA_workspace_types.h"
  
  #include "BKE_action.h"
  #include "BKE_animsys.h"
diff --cc source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
index c25a5f90059,70ff4a373dd..227c50420dd
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
@@@ -33,15 -33,13 +33,15 @@@
  #include <math.h>
  #include <string.h>
  
- struct LineartStaticMemPool;
- struct LineartStaticMemPoolNode;
  struct LineartEdge;
  struct LineartRenderBuffer;
+ struct LineartStaticMemPool;
+ struct LineartStaticMemPoolNode;
  
 -void *lineart_list_append_pointer_pool(ListBase *h, struct LineartStaticMemPool *smp, void *data);
 -void *lineart_list_append_pointer_pool_sized(ListBase *h,
 +void *lineart_list_append_pointer_pool(ListBase *list,
 +                                       struct LineartStaticMemPool *smp,
 +                                       void *data);
 +void *lineart_list_append_pointer_pool_sized(ListBase *list,
                                               struct LineartStaticMemPool *smp,
                                               void *data,
                                               int size);