[Bf-blender-cvs] [7f9a4d521a0] soc-2019-npr: Cleanup: Redundant defines.

[YimingWu]

Commit: 7f9a4d521a0492289fc3c4410673ea31264bea0b
Author: YimingWu
Date:   Mon Jul 15 16:51:56 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB7f9a4d521a0492289fc3c4410673ea31264bea0b

Cleanup: Redundant defines.

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

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

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

diff --git a/source/blender/draw/engines/lanpr/lanpr_access.h b/source/blender/draw/engines/lanpr/lanpr_access.h
index 27ad26cfc9a..1471c411f14 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.h
+++ b/source/blender/draw/engines/lanpr/lanpr_access.h
@@ -10,7 +10,7 @@
 
 typedef struct LANPR_RenderLineChain LANPR_RenderLineChain;
 
-/* GPenicl (deprecated) */
+/* GPencil */
 void lanpr_generate_gpencil_from_chain(Depsgraph *depsgraph,
                                        struct Object *ob,
                                        bGPDlayer *gpl,
@@ -21,8 +21,6 @@ void lanpr_generate_gpencil_from_chain(Depsgraph *depsgraph,
                                        struct Collection *col,
                                        int types);
 
-void ED_lanpr_update_data_for_external(Depsgraph *depsgraph);
-
 int ED_lanpr_count_chain(LANPR_RenderLineChain *rlc);
 void ED_lanpr_chain_clear_picked_flag(struct LANPR_RenderBuffer *rb);
 
diff --git a/source/blender/editors/lanpr/lanpr_ops.c b/source/blender/editors/lanpr/lanpr_ops.c
index 97e5e777ab1..a482d68fb0a 100644
--- a/source/blender/editors/lanpr/lanpr_ops.c
+++ b/source/blender/editors/lanpr/lanpr_ops.c
@@ -71,8 +71,6 @@ struct Object;
 
 /* External defines */
 
-void ED_lanpr_update_data_for_external(struct Depsgraph *depsgraph);
-
 int ED_lanpr_count_chain(LANPR_RenderLineChain *rlc);
 void ED_lanpr_chain_clear_picked_flag(struct LANPR_RenderBuffer *rb);
 
@@ -2825,9 +2823,6 @@ static void lanpr_clear_render_state(LANPR_RenderBuffer *rb)
 
 /* Buffer operations */
 
-
-extern LANPR_SharedResource lanpr_share;
-
 void ED_lanpr_destroy_render_data(LANPR_RenderBuffer *rb)
 {
   LANPR_RenderElementLinkNode *reln;
@@ -4195,20 +4190,6 @@ void SCENE_OT_lanpr_export_svg(wmOperatorType *ot)
 
 /* Access */
 
-/* Probably remove this in the future. */
-void ED_lanpr_update_data_for_external(Depsgraph *depsgraph)
-{
-  Scene *scene = DEG_get_evaluated_scene(depsgraph);
-  SceneLANPR *lanpr = &scene->lanpr;
-  if (lanpr->master_mode != LANPR_MASTER_MODE_SOFTWARE) {
-    return;
-  }
-  if (!lanpr_share.render_buffer_shared ||
-      lanpr_share.render_buffer_shared->cached_for_frame != scene->r.cfra) {
-    ED_lanpr_compute_feature_lines_internal(depsgraph, 0);
-  }
-}
-
 bool ED_lanpr_dpix_shader_error()
 {
   return lanpr_share.dpix_shader_error;