[Bf-blender-cvs] [e6273ea3c7b] soc-2019-npr: LANPR: Changed to ED_ prefix.

[YimingWu]

Commit: e6273ea3c7b4b17bd67e403acb6050aad748fb0d
Author: YimingWu
Date:   Sat Jul 13 14:36:23 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBe6273ea3c7b4b17bd67e403acb6050aad748fb0d

LANPR: Changed to ED_ prefix.

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

M	source/blender/blenkernel/intern/scene.c
M	source/blender/draw/engines/lanpr/lanpr_access.h
M	source/blender/editors/lanpr/lanpr_ops.c
M	source/blender/makesrna/intern/rna_scene.c
M	source/blender/modifiers/intern/MOD_edgesplit.c

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 068b0ada967..d9f98018ca0 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -339,7 +339,7 @@ void BKE_scene_copy_data(Main *bmain, Scene *sce_dst, const Scene *sce_src, cons
 
   /* lanpr data */
 
-  lanpr_copy_data(sce_src, sce_dst);
+  ED_lanpr_copy_data(sce_src, sce_dst);
 }
 
 Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
@@ -548,7 +548,7 @@ void BKE_scene_free_ex(Scene *sce, const bool do_id_user)
     sce->eevee.light_cache = NULL;
   }
 
-  lanpr_free_everything(sce);
+  ED_lanpr_free_everything(sce);
 
   /* These are freed on doversion. */
   BLI_assert(sce->layer_properties == NULL);
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.h b/source/blender/draw/engines/lanpr/lanpr_access.h
index 426ecc53a11..a68a4a7a98d 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.h
+++ b/source/blender/draw/engines/lanpr/lanpr_access.h
@@ -20,7 +20,7 @@ void lanpr_generate_gpencil_from_chain(Depsgraph *depsgraph,
                                        struct Collection *col,
                                        int types);
 
-void lanpr_update_data_for_external(Depsgraph *depsgraph);
+void ED_lanpr_update_data_for_external(Depsgraph *depsgraph);
 
 int lanpr_count_chain(LANPR_RenderLineChain *rlc);
 
@@ -30,12 +30,12 @@ int lanpr_compute_feature_lines_internal(Depsgraph *depsgraph, int instersection
 
 void lanpr_destroy_render_data(struct LANPR_RenderBuffer *rb);
 
-bool lanpr_dpix_shader_error();
+bool ED_lanpr_dpix_shader_error();
 
-bool lanpr_disable_edge_splits(struct Scene *s);
+bool ED_lanpr_disable_edge_splits(struct Scene *s);
 
-void lanpr_copy_data(struct Scene *from, struct Scene *to);
+void ED_lanpr_copy_data(struct Scene *from, struct Scene *to);
 
-void lanpr_free_everything(struct Scene *s);
+void ED_lanpr_free_everything(struct Scene *s);
 
 #endif
diff --git a/source/blender/editors/lanpr/lanpr_ops.c b/source/blender/editors/lanpr/lanpr_ops.c
index 35abd9b0b7f..f08e0bf779c 100644
--- a/source/blender/editors/lanpr/lanpr_ops.c
+++ b/source/blender/editors/lanpr/lanpr_ops.c
@@ -64,7 +64,7 @@ extern LANPR_SharedResource lanpr_share;
 extern const char *RE_engine_id_BLENDER_LANPR;
 struct Object;
 
-void lanpr_update_data_for_external(struct Depsgraph *depsgraph);
+void ED_lanpr_update_data_for_external(struct Depsgraph *depsgraph);
 
 int lanpr_count_chain(LANPR_RenderLineChain *rlc);
 
@@ -74,13 +74,18 @@ int lanpr_compute_feature_lines_internal(struct Depsgraph *depsgraph, int inster
 
 void lanpr_destroy_render_data(struct LANPR_RenderBuffer *rb);
 
-bool lanpr_dpix_shader_error();
+bool ED_lanpr_dpix_shader_error();
 
-bool lanpr_disable_edge_splits(struct Scene *s);
+bool ED_lanpr_disable_edge_splits(struct Scene *s);
+
+void ED_lanpr_copy_data(struct Scene *from, struct Scene *to);
+
+void ED_lanpr_free_everything(struct Scene *s);
+
+
+/* Calculations */
 
-void lanpr_copy_data(struct Scene *from, struct Scene *to);
 
-void lanpr_free_everything(struct Scene *s);
 
 
 
@@ -130,11 +135,10 @@ void SCENE_OT_lanpr_export_svg(wmOperatorType *ot)
 }
 
 
-
-
 /* Access */
 
-void lanpr_update_data_for_external(Depsgraph *depsgraph)
+/* 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;
@@ -147,16 +151,16 @@ void lanpr_update_data_for_external(Depsgraph *depsgraph)
   }
 }
 
-bool lanpr_dpix_shader_error()
+bool ED_lanpr_dpix_shader_error()
 {
   return lanpr_share.dpix_shader_error;
 }
-bool lanpr_disable_edge_splits(Scene *s)
+bool ED_lanpr_disable_edge_splits(Scene *s)
 {
   return (s->lanpr.enabled && s->lanpr.disable_edge_splits);
 }
 
-void lanpr_copy_data(Scene *from, Scene *to)
+void ED_lanpr_copy_data(Scene *from, Scene *to)
 {
   SceneLANPR *lanpr = &from->lanpr;
   LANPR_RenderBuffer *rb = lanpr_share.render_buffer_shared, *new_rb;
@@ -182,7 +186,7 @@ void lanpr_copy_data(Scene *from, Scene *to)
   /*  render_buffer now only accessible from lanpr_share */
 }
 
-void lanpr_free_everything(Scene *s)
+void ED_lanpr_free_everything(Scene *s)
 {
   SceneLANPR *lanpr = &s->lanpr;
   LANPR_LineLayer *ll;
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 2a2de2762c4..b2e106fb6d3 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2490,11 +2490,11 @@ void rna_lanpr_active_line_layer_set(PointerRNA *ptr, PointerRNA value)
   lanpr->active_layer = value.data;
 }
 
-extern bool lanpr_dpix_shader_error();
+extern bool ED_lanpr_dpix_shader_error();
 
 static bool rna_lanpr_shader_error_get(PointerRNA *ptr)
 {
-  return lanpr_dpix_shader_error();
+  return ED_lanpr_dpix_shader_error();
 }
 
 #else
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c
index d9fdbda76bb..ed2f49cf496 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -135,7 +135,7 @@ static bool isDisabled(const struct Scene *scene, struct ModifierData *md, bool
   ModifierData *imd;
   EdgeSplitModifierData *emd = (EdgeSplitModifierData *)md;
 
-  if (lanpr_disable_edge_splits(scene)) {
+  if (ED_lanpr_disable_edge_splits(scene)) {
     lanpr_found = 1;
   }
   if (!lanpr_found) {