[Bf-blender-cvs] [1699d79b42a] lanpr-under-gp: LineArt: Fix compiler errors and warnings in Windows

[Antonio Vazquez]

Commit: 1699d79b42a70f81da7c673e64c09e150a101a4f
Author: Antonio Vazquez
Date:   Tue Jul 7 16:19:54 2020 +0200
Branches: lanpr-under-gp
https://developer.blender.org/rB1699d79b42a70f81da7c673e64c09e150a101a4f

LineArt: Fix compiler errors and warnings in Windows

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

M	source/blender/editors/lineart/lineart_cpu.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c

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

diff --git a/source/blender/editors/lineart/lineart_cpu.c b/source/blender/editors/lineart/lineart_cpu.c
index fe871c529a4..c362c27b66f 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -4085,8 +4085,8 @@ static int lineart_bake_gpencil_strokes_exec(bContext *C, wmOperator *UNUSED(op)
                 gpl,
                 gpf,
                 lmd->source_type,
-                lmd->source_type == LRT_SOURCE_OBJECT ? lmd->source_object :
-                                                        lmd->source_collection,
+                lmd->source_type == LRT_SOURCE_OBJECT ? (void *)lmd->source_object :
+                                                        (void *)lmd->source_collection,
                 lmd->level_start,
                 lmd->use_multiple_levels ? lmd->level_end : lmd->level_start,
                 lmd->target_material ?
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 89f67d03935..057401374fb 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -87,7 +87,8 @@ static void generate_strokes_actual(
       gpl,
       gpf,
       lmd->source_type,
-      lmd->source_type == LRT_SOURCE_OBJECT ? lmd->source_object : lmd->source_collection,
+      lmd->source_type == LRT_SOURCE_OBJECT ? (void *)lmd->source_object :
+                                              (void *)lmd->source_collection,
       lmd->level_start,
       lmd->use_multiple_levels ? lmd->level_end : lmd->level_start,
       lmd->target_material ? BKE_gpencil_object_material_index_get(ob, lmd->target_material) : 0,
@@ -135,8 +136,6 @@ static void generateStrokes(GpencilModifierData *md, Depsgraph *depsgraph, Objec
   /* If we reach here, means calculation is finished (LRT_SYNC_FRESH), we grab cache. flag reset is
    * done by calculation function.*/
 
-  Scene *scene = DEG_get_evaluated_scene(depsgraph);
-
   bGPDlayer *gpl = BKE_gpencil_layer_get_by_name(gpd, lmd->target_layer, 1);
   bGPDframe *gpf = gpl->actframe;
   if (gpf == NULL) {
@@ -155,7 +154,6 @@ static void bakeModifier(Main *UNUSED(bmain),
 {
 
   bGPdata *gpd = ob->data;
-  Scene *scene = DEG_get_evaluated_scene(depsgraph);
   LineartGpencilModifierData *lmd = (LineartGpencilModifierData *)md;
 
   bGPDlayer *gpl = BKE_gpencil_layer_get_by_name(gpd, lmd->target_layer, 1);
@@ -183,7 +181,6 @@ static void updateDepsgraph(GpencilModifierData *md,
         ctx->node, lmd->source_object, DEG_OB_COMP_TRANSFORM, "Line Art Modifier");
   }
   else {
-    Object *ob;
     FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN (ctx->scene->master_collection, ob, mode) {
       if (ob->type == OB_MESH) {
         if (!(ob->lineart.flags & COLLECTION_LRT_EXCLUDE)) {