Commit: 5322c2069d983864412bff404812b842232dbcc4
Author: YimingWu
Date: Fri Aug 9 09:01:24 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB5322c2069d983864412bff404812b842232dbcc4
Cleanup: Remove obsolete LANPR includes from CMakeLists
===================================================================
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/gpencil.c
M source/blender/gpencil_modifiers/CMakeLists.txt
M source/blender/modifiers/CMakeLists.txt
M source/blender/modifiers/intern/MOD_edgesplit.c
M source/blender/modifiers/intern/MOD_featureline.c
===================================================================
diff --git a/source/blender/blenkernel/CMakeLists.txt
b/source/blender/blenkernel/CMakeLists.txt
index 46cad0c6d64..d9bd87d97b5 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -50,8 +50,6 @@ set(INC
../../../intern/opensubdiv
../../../extern/curve_fit_nd
../../../intern/smoke/extern
-
- ../draw/engines/lanpr
)
set(INC_SYS
diff --git a/source/blender/blenkernel/intern/gpencil.c
b/source/blender/blenkernel/intern/gpencil.c
index 7fb8d27c24c..9056e4502e6 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1921,8 +1921,8 @@ bool BKE_gpencil_shrink_stroke(bGPDstroke *gps, const
float dist)
second_last = &pt[gps->totpoints - 2];
next_pt = &pt[1];
- float len1 = 0, this_len1, cut_len1;
- float len2 = 0, this_len2, cut_len2;
+ float len1 = 0, this_len1 = 0, cut_len1 = 0;
+ float len2 = 0, this_len2 = 0, cut_len2 = 0;
int index_start, index_end;
i = 1;
@@ -2761,11 +2761,11 @@ static Collection *gpencil_get_parent_collection(Scene
*scene, Object *ob)
/* Helper function to convert one spline to grease pencil stroke. */
static void gpencil_convert_spline(Main *bmain,
- Scene *scene,
+ Scene *UNUSED(scene),
Object *ob_gp,
Object *ob_cu,
const bool gpencil_lines,
- const bool use_collections,
+ const bool UNUSED(use_collections),
bGPDframe *gpf,
Nurb *nu)
{
diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt
b/source/blender/gpencil_modifiers/CMakeLists.txt
index 30e28c6ac5f..e70ac204f66 100644
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -33,8 +33,6 @@ set(INC
../../../intern/elbeem/extern
../../../intern/eigen
../../../intern/guardedalloc
-
- ../draw/engines/lanpr
)
set(INC_SYS
@@ -68,7 +66,6 @@ set(SRC
)
set(LIB
- bf_draw
)
if(WITH_INTERNATIONAL)
diff --git a/source/blender/modifiers/CMakeLists.txt
b/source/blender/modifiers/CMakeLists.txt
index 52907a53fb6..7fb254ecfdb 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -32,7 +32,6 @@ set(INC
../../../intern/elbeem/extern
../../../intern/eigen
../../../intern/guardedalloc
- ../draw/engines/lanpr
)
set(INC_SYS
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c
b/source/blender/modifiers/intern/MOD_edgesplit.c
index 82e2f102e9d..904d600164a 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -41,8 +41,6 @@
#include "MOD_modifiertypes.h"
-#include "lanpr_access.h"
-
static Mesh *doEdgeSplit(Mesh *mesh, EdgeSplitModifierData *emd)
{
Mesh *result;
diff --git a/source/blender/modifiers/intern/MOD_featureline.c
b/source/blender/modifiers/intern/MOD_featureline.c
index 54d93d71f26..a1b0f9141d8 100644
--- a/source/blender/modifiers/intern/MOD_featureline.c
+++ b/source/blender/modifiers/intern/MOD_featureline.c
@@ -55,8 +55,6 @@
#include "DEG_depsgraph_build.h"
#include "DEG_depsgraph_query.h"
-#include "lanpr_access.h"
-
static void initData(ModifierData *md)
{
FeatureLineModifierData *flmd = (FeatureLineModifierData *)md;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
