[Bf-blender-cvs] [be138d3380f] soc-2019-npr: LANPR: target GP material selection working

[YimingWu]

Commit: be138d3380fb99dd96ea06798c2ddaf53f905b1b
Author: YimingWu
Date:   Tue Jun 25 13:44:44 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBbe138d3380fb99dd96ea06798c2ddaf53f905b1b

LANPR: target GP material selection working

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

M	source/blender/draw/engines/lanpr/lanpr_access.c
M	source/blender/draw/engines/lanpr/lanpr_access.h
M	source/blender/draw/engines/lanpr/lanpr_ops.c

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

diff --git a/source/blender/draw/engines/lanpr/lanpr_access.c b/source/blender/draw/engines/lanpr/lanpr_access.c
index 74dc6e9938d..e324d151172 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.c
+++ b/source/blender/draw/engines/lanpr/lanpr_access.c
@@ -40,7 +40,7 @@ static BMVert *split_edge_and_move(BMesh *bm, BMEdge *edge, const float new_pos[
 }
 
 void lanpr_generate_gpencil_from_chain(
-    Depsgraph *depsgraph, Object *ob, bGPDlayer *gpl, bGPDframe *gpf, int qi_begin, int qi_end)
+    Depsgraph *depsgraph, Object *ob, bGPDlayer *gpl, bGPDframe *gpf, int qi_begin, int qi_end, int material_nr)
 {
   Scene *scene = DEG_get_evaluated_scene(depsgraph);
   LANPR_RenderBuffer *rb = lanpr_share.render_buffer_shared;
@@ -94,6 +94,7 @@ void lanpr_generate_gpencil_from_chain(
     }
 
     BKE_gpencil_stroke_add_points(gps, stroke_data, count, mat);
+    gps->mat_nr = material_nr;
   }
 }
 
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.h b/source/blender/draw/engines/lanpr/lanpr_access.h
index 1bd71b7353b..d4ec4cc3075 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.h
+++ b/source/blender/draw/engines/lanpr/lanpr_access.h
@@ -11,7 +11,7 @@
 typedef struct LANPR_RenderLineChain LANPR_RenderLineChain;
 
 void lanpr_generate_gpencil_from_chain(
-    Depsgraph *depsgraph, Object *ob, bGPDlayer *gpl, bGPDframe *gpf, int qi_begin, int qi_end);
+    Depsgraph *depsgraph, Object *ob, bGPDlayer *gpl, bGPDframe *gpf, int qi_begin, int qi_end, int material_nr);
 
 void lanpr_update_data_for_external(Depsgraph *depsgraph);
 
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c
index 1469fafc807..8c50699683e 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -4309,11 +4309,13 @@ void lanpr_update_gp_strokes_recursive(Depsgraph *dg, struct Collection *col, in
           if (!gpl) {
             gpl = BKE_gpencil_layer_addnew(gpd, "lanpr_layer", true);
           }
-          gpf = BKE_gpencil_frame_addnew(gpl, frame);
-          BKE_gpencil_free_strokes(gpf);  /*  force clear now */
+          gpf = BKE_gpencil_layer_getframe(gpl, frame, GP_GETFRAME_ADD_NEW);
+          /* BKE_gpencil_free_strokes(gpf);   will be overwritten. need another solution */
+          /* Please manually delete those strokes before clicking Update once again. */
 
           lanpr_generate_gpencil_from_chain(dg, ob, gpl, gpf, 
-            flmd->level_begin, flmd->use_multiple_levels?flmd->level_end:flmd->level_begin);
+            flmd->level_begin, flmd->use_multiple_levels?flmd->level_end:flmd->level_begin,
+            flmd->material);
         }
       }
     }