[Bf-blender-cvs] [cc2a1954d9e] lanpr-under-gp: Refactor: LANPR file names changed to lineart.
YimingWu
noreply at git.blender.org
Sat Jun 27 10:08:44 CEST 2020
Commit: cc2a1954d9ee7052a5b1f741168d64379a7e6856
Author: YimingWu
Date: Sat Jun 27 16:08:38 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBcc2a1954d9ee7052a5b1f741168d64379a7e6856
Refactor: LANPR file names changed to lineart.
===================================================================
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/CMakeLists.txt
R099 source/blender/editors/include/ED_lanpr.h source/blender/editors/include/ED_lineart.h
R092 source/blender/editors/lanpr/CMakeLists.txt source/blender/editors/lineart/CMakeLists.txt
R098 source/blender/editors/lanpr/lanpr_chain.c source/blender/editors/lineart/lineart_chain.c
R099 source/blender/editors/lanpr/lanpr_cpu.c source/blender/editors/lineart/lineart_cpu.c
R098 source/blender/editors/lanpr/lanpr_intern.h source/blender/editors/lineart/lineart_intern.h
R098 source/blender/editors/lanpr/lanpr_ops.c source/blender/editors/lineart/lineart_ops.c
R098 source/blender/editors/lanpr/lanpr_util.c source/blender/editors/lineart/lineart_util.c
M source/blender/editors/render/render_update.c
M source/blender/editors/space_api/spacetypes.c
M source/blender/editors/util/CMakeLists.txt
M source/blender/editors/util/ed_util.c
M source/blender/gpencil_modifiers/CMakeLists.txt
R099 source/blender/gpencil_modifiers/intern/MOD_gpencillanpr.c source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
M source/blender/makesdna/DNA_collection_types.h
R099 source/blender/makesdna/DNA_lanpr_types.h source/blender/makesdna/DNA_lineart_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/intern/makesdna.c
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_collection.c
R099 source/blender/makesrna/intern/rna_lanpr.c source/blender/makesrna/intern/rna_lineart.c
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 3d3af550dc7..a4217ae1e40 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -62,11 +62,11 @@
#include "DNA_hair_types.h"
#include "DNA_ipo_types.h"
#include "DNA_key_types.h"
-#include "DNA_lanpr_types.h"
#include "DNA_lattice_types.h"
#include "DNA_layer_types.h"
#include "DNA_light_types.h"
#include "DNA_lightprobe_types.h"
+#include "DNA_lineart_types.h"
#include "DNA_linestyle_types.h"
#include "DNA_mask_types.h"
#include "DNA_material_types.h"
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 0596dee7565..e50ca4109a4 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -110,11 +110,11 @@
#include "DNA_gpencil_types.h"
#include "DNA_hair_types.h"
#include "DNA_key_types.h"
-#include "DNA_lanpr_types.h"
#include "DNA_lattice_types.h"
#include "DNA_layer_types.h"
#include "DNA_light_types.h"
#include "DNA_lightprobe_types.h"
+#include "DNA_lineart_types.h"
#include "DNA_linestyle_types.h"
#include "DNA_mask_types.h"
#include "DNA_material_types.h"
diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
index b7e1eb94769..fec1e8c305d 100644
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -67,5 +67,5 @@ add_subdirectory(datafiles)
if(WITH_LINEART)
add_definitions(-DWITH_LINEART)
- add_subdirectory(lanpr)
+ add_subdirectory(lineart)
endif()
diff --git a/source/blender/editors/include/ED_lanpr.h b/source/blender/editors/include/ED_lineart.h
similarity index 99%
rename from source/blender/editors/include/ED_lanpr.h
rename to source/blender/editors/include/ED_lineart.h
index cafcdd14319..3fb9625ec1b 100644
--- a/source/blender/editors/include/ED_lanpr.h
+++ b/source/blender/editors/include/ED_lineart.h
@@ -33,7 +33,7 @@
#include "BLI_math.h"
#include "BLI_threads.h"
-#include "DNA_lanpr_types.h"
+#include "DNA_lineart_types.h"
#include <math.h>
#include <string.h>
diff --git a/source/blender/editors/lanpr/CMakeLists.txt b/source/blender/editors/lineart/CMakeLists.txt
similarity index 92%
rename from source/blender/editors/lanpr/CMakeLists.txt
rename to source/blender/editors/lineart/CMakeLists.txt
index 2b70d661df4..d8c5ab1d77f 100644
--- a/source/blender/editors/lanpr/CMakeLists.txt
+++ b/source/blender/editors/lineart/CMakeLists.txt
@@ -32,12 +32,12 @@ set(INC_SYS
)
set(SRC
- lanpr_ops.c
- lanpr_cpu.c
- lanpr_chain.c
- lanpr_util.c
+ lineart_ops.c
+ lineart_cpu.c
+ lineart_chain.c
+ lineart_util.c
- lanpr_intern.h
+ lineart_intern.h
)
set(LIB
diff --git a/source/blender/editors/lanpr/lanpr_chain.c b/source/blender/editors/lineart/lineart_chain.c
similarity index 98%
rename from source/blender/editors/lanpr/lanpr_chain.c
rename to source/blender/editors/lineart/lineart_chain.c
index 0d51b5cc23a..daecf562784 100644
--- a/source/blender/editors/lanpr/lanpr_chain.c
+++ b/source/blender/editors/lineart/lineart_chain.c
@@ -31,25 +31,25 @@
#include "DEG_depsgraph_query.h"
#include "DNA_camera_types.h"
-#include "DNA_lanpr_types.h"
+#include "DNA_lineart_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_scene_types.h"
-#include "ED_lanpr.h"
+#include "ED_lineart.h"
#include "bmesh.h"
-#include "lanpr_intern.h"
+#include "lineart_intern.h"
#include <math.h>
#define LRT_OTHER_RV(rl, rv) ((rv) == (rl)->l ? (rl)->r : (rl)->l)
static LineartRenderLine *lineart_get_connected_render_line(LineartBoundingArea *ba,
- LineartRenderVert *rv,
- LineartRenderVert **new_rv,
- int match_flag)
+ LineartRenderVert *rv,
+ LineartRenderVert **new_rv,
+ int match_flag)
{
LinkData *lip;
LineartRenderLine *nrl;
@@ -467,7 +467,7 @@ static LineartBoundingArea *lineart_get_rlci_bounding_area_recursive(
return NULL;
}
static LineartBoundingArea *lineart_get_end_point_bounding_area(LineartRenderBuffer *rb,
- LineartRenderLineChainItem *rlci)
+ LineartRenderLineChainItem *rlci)
{
if (!rlci) {
return NULL;
diff --git a/source/blender/editors/lanpr/lanpr_cpu.c b/source/blender/editors/lineart/lineart_cpu.c
similarity index 99%
rename from source/blender/editors/lanpr/lanpr_cpu.c
rename to source/blender/editors/lineart/lineart_cpu.c
index 443fdfd654a..a4cb56ab0f2 100644
--- a/source/blender/editors/lanpr/lanpr_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -21,7 +21,7 @@
* \ingroup editors
*/
-#include "ED_lanpr.h"
+#include "ED_lineart.h"
#include "BLI_alloca.h"
#include "BLI_linklist.h"
@@ -43,7 +43,7 @@
#include "DEG_depsgraph_query.h"
#include "DNA_camera_types.h"
#include "DNA_gpencil_types.h"
-#include "DNA_lanpr_types.h"
+#include "DNA_lineart_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_modifier_types.h"
@@ -66,7 +66,7 @@
#include "BKE_text.h"
-#include "lanpr_intern.h"
+#include "lineart_intern.h"
LineartSharedResource lineart_share;
diff --git a/source/blender/editors/lanpr/lanpr_intern.h b/source/blender/editors/lineart/lineart_intern.h
similarity index 98%
rename from source/blender/editors/lanpr/lanpr_intern.h
rename to source/blender/editors/lineart/lineart_intern.h
index 92e10d86211..5678e90a3e8 100644
--- a/source/blender/editors/lanpr/lanpr_intern.h
+++ b/source/blender/editors/lineart/lineart_intern.h
@@ -29,7 +29,7 @@
#include "BLI_math.h"
#include "BLI_threads.h"
-#include "DNA_lanpr_types.h"
+#include "DNA_lineart_types.h"
#include <math.h>
#include <string.h>
diff --git a/source/blender/editors/lanpr/lanpr_ops.c b/source/blender/editors/lineart/lineart_ops.c
similarity index 98%
rename from source/blender/editors/lanpr/lanpr_ops.c
rename to source/blender/editors/lineart/lineart_ops.c
index cff9c320945..de8d8ecccb4 100644
--- a/source/blender/editors/lanpr/lanpr_ops.c
+++ b/source/blender/editors/lineart/lineart_ops.c
@@ -27,7 +27,7 @@
#include "WM_api.h"
-#include "ED_lanpr.h"
+#include "ED_lineart.h"
void ED_operatortypes_lineart(void)
{
diff --git a/source/blender/editors/lanpr/lanpr_util.c b/source/blender/editors/lineart/lineart_util.c
similarity index 98%
rename from source/blender/editors/lanpr/lanpr_util.c
rename to source/blender/editors/lineart/lineart_util.c
index b4a46ea3900..1f7836cf6d0 100644
--- a/source/blender/editors/lanpr/lanpr_util.c
+++ b/source/blender/editors/lineart/lineart_util.c
@@ -24,11 +24,11 @@
#include <stdio.h>
#include <stdlib.h>
/* #include <time.h> */
-#include "ED_lanpr.h"
+#include "ED_lineart.h"
#include "MEM_guardedalloc.h"
#include <math.h>
-#include "lanpr_intern.h"
+#include "lineart_intern.h"
/* ===================================================================[slt] */
diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c
index 0a0ec20a33e..52abfd3368f 100644
--- a/source/blender/editors/render/render_update.c
+++ b/source/blender/editors/render/render_update.c
@@ -60,7 +60,7 @@
#include "ED_view3d.h"
#ifdef WITH_LINEART
-# include "ED_lanpr.h"
+# include "ED_lineart.h"
#endif
#include "DEG_depsgraph.h"
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index 9e8dad61791..9a7add42307 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -65,7 +65,7 @@
#include "ED_uvedit.h"
#ifdef WITH_LINEART
-# include "ED_lanpr.h"
+# include "ED_lineart.h"
#endif
#include "io_ops.h"
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index a30001da55c..73aeb09b50a 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -62,7 +62,7 @@ set(SRC
../include/ED_keyframes_draw.h
../include/ED_keyframes_edit.h
../include/ED_keyframing.h
- ../include/ED_lanpr.h
+ ../include/ED_lineart.h
../include/ED_lattice.h
../include/ED_logic.h
../include/ED_markers.h
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c
index 71d0a60abcb..74e6375654d 100644
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@ -60,7 +60,7 @@
#include "ED_armature.h"
#include "ED_buttons.h"
#include "ED_image.h"
-#include "ED_lanpr.h"
+#include "ED_lineart.h"
#include "ED_mesh.h"
#include "ED_node.h"
#include "ED_object.h"
diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt
index dc08d612bc9..d8f69d8874d 100644
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -51,7 +51,7 @@ set(SRC
intern/MOD_gpencilbuild.c
intern/MOD_gpencilcolor.c
intern/MOD_gpencilhook.c
- intern/MOD_gpencillanpr.c
+ intern/MOD_gpencillineart.c
intern/MOD_gpencillattice.c
intern/MOD_gpencilmirror.c
intern/MOD_gpencilmultiply.c
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillanpr.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
similarity index 99%
rename from source/blender/gpencil_modifiers/intern/MOD_gpencillanpr.c
rename to source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 7b005a01745..fe6c6043c19 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillanpr.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -37,7 +37,7 @@
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
-#include "ED_lanpr.h"
+#include "ED_lineart.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list