[Bf-blender-cvs] [f9568c4c1fa] lineart-fn-cached: Merge remote-tracking branch 'origin/master' into lineart-fn-cached

[YimingWu]

Commit: f9568c4c1fa60c0f081b79bbf4607a70862289b4
Author: YimingWu
Date:   Mon Jun 14 17:36:11 2021 +0800
Branches: lineart-fn-cached
https://developer.blender.org/rBf9568c4c1fa60c0f081b79bbf4607a70862289b4

Merge remote-tracking branch 'origin/master' into lineart-fn-cached

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index b68f65a9c39,268598ccc51..8e44b3254c0
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -26,7 -27,7 +27,8 @@@
  
  #include "DNA_brush_types.h"
  #include "DNA_genfile.h"
 +#include "DNA_gpencil_modifier_types.h"
+ #include "DNA_listBase.h"
  #include "DNA_modifier_types.h"
  #include "DNA_text_types.h"
  
diff --cc source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
index 6591b6d4ff7,25c4e959ac1..f90fbaf4ccf
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
@@@ -74,7 -74,7 +74,7 @@@ static LineartEdge *lineart_line_get_co
  static LineartEdgeChain *lineart_chain_create(LineartRenderBuffer *rb)
  {
    LineartEdgeChain *ec;
--  ec = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartEdgeChain));
++  ec = lineart_mem_acquire(rb->chain_data_pool, sizeof(LineartEdgeChain));
  
    BLI_addtail(&rb->chains, ec);
  
@@@ -119,7 -119,7 +119,7 @@@ static LineartEdgeChainItem *lineart_ch
      return old_rlci;
    }
  
--  eci = lineart_mem_acquire(&rb->render_data_pool, 
sizeof(LineartEdgeChainItem));
++  eci = lineart_mem_acquire(rb->chain_data_pool, 
sizeof(LineartEdgeChainItem));
  
    copy_v2_v2(eci->pos, fbcoord);
    copy_v3_v3(eci->gpos, gpos);
@@@ -149,7 -149,7 +149,7 @@@ static LineartEdgeChainItem *lineart_ch
      return ec->chain.first;
    }
  
--  eci = lineart_mem_acquire(&rb->render_data_pool, 
sizeof(LineartEdgeChainItem));
++  eci = lineart_mem_acquire(rb->chain_data_pool, 
sizeof(LineartEdgeChainItem));
  
    copy_v2_v2(eci->pos, fbcoord);
    copy_v3_v3(eci->gpos, gpos);
diff --cc source/tools
index f99d29ae3e6,2afbb8ec472..01f51a0e551
--- a/source/tools
+++ b/source/tools
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit f99d29ae3e6ad44d45d79309454c45f8088781a4
 -Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685
++Subproject commit 01f51a0e551ab730f0934dc6488613690ac4bf8f

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs