[Bf-blender-cvs] [282d12663f0] lanpr-under-gp: LineArt: Ris for New APIs

[YimingWu]

Commit: 282d12663f07be58a62e7ff6f02537e6e7d55212
Author: YimingWu
Date:   Sun Nov 15 12:24:23 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB282d12663f07be58a62e7ff6f02537e6e7d55212

LineArt: Ris for New APIs

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

M	source/blender/blenloader/intern/versioning_290.c
M	source/blender/editors/lineart/lineart_cpu.c

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

diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index 7f292f6fe15..3db14e9e88d 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -1164,6 +1164,8 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
             }
           }
         }
+      }
+    }
 
     if (!DNA_struct_find(fd->filesdna, "SceneLineArt")) {
       LISTBASE_FOREACH (Scene *, sc, &bmain->scenes) {
diff --git a/source/blender/editors/lineart/lineart_cpu.c b/source/blender/editors/lineart/lineart_cpu.c
index 8debc1cc32d..6bf359ea7f9 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -4095,12 +4095,12 @@ void ED_lineart_gpencil_generate(Depsgraph *depsgraph,
     }
 
     if (pre_sample_length > 0.0001) {
-      BKE_gpencil_stroke_sample(gps, pre_sample_length, false);
+      BKE_gpencil_stroke_sample(gpencil_object->data, gps, pre_sample_length, false);
     }
     if (G.debug_value == 4000) {
       BKE_gpencil_stroke_set_random_color(gps);
     }
-    BKE_gpencil_stroke_geometry_update(gps);
+    BKE_gpencil_stroke_geometry_update(gpencil_object->data, gps);
     stroke_count++;
   }