[Bf-blender-cvs] [b6fa99e2190] soc-2019-npr: Cleanup: Remove obsolete lanpr_access.h

YimingWu noreply at git.blender.org
Fri Aug 9 03:49:19 CEST 2019


Commit: b6fa99e21908dda402407c00ad22db87d67ac02b
Author: YimingWu
Date:   Fri Aug 9 09:49:09 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBb6fa99e21908dda402407c00ad22db87d67ac02b

Cleanup: Remove obsolete lanpr_access.h

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

M	source/blender/blenkernel/intern/scene.c
M	source/blender/draw/CMakeLists.txt
D	source/blender/draw/engines/lanpr/lanpr_access.h
M	source/blender/draw/engines/lanpr/lanpr_cpu.c
M	source/blender/draw/engines/lanpr/lanpr_engine.c
M	source/blender/makesdna/DNA_gpencil_modifier_types.h
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 80f0650e611..01964b61c0d 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -96,8 +96,6 @@
 
 #include "engines/eevee/eevee_lightcache.h"
 
-#include "engines/lanpr/lanpr_access.h"
-
 #include "PIL_time.h"
 
 #include "IMB_colormanagement.h"
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 5440797454a..8bb309d72d9 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -161,7 +161,6 @@ set(SRC
   engines/workbench/workbench_engine.h
   engines/workbench/workbench_private.h
 	engines/lanpr/lanpr_all.h
-  engines/lanpr/lanpr_access.h
   engines/select/select_engine.h
   engines/select/select_private.h
 )
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.h b/source/blender/draw/engines/lanpr/lanpr_access.h
deleted file mode 100644
index b590250fc56..00000000000
--- a/source/blender/draw/engines/lanpr/lanpr_access.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef __LANPR_ACCESS_H__
-#define __LANPR_ACCESS_H__
-
-#include "DNA_gpencil_types.h"
-#include "DNA_gpencil_modifier_types.h"
-
-#include "DEG_depsgraph.h"
-
-#include "BKE_gpencil.h"
-
-typedef struct LANPR_RenderLineChain LANPR_RenderLineChain;
-
-/* GPencil */
-void lanpr_generate_gpencil_from_chain(Depsgraph *depsgraph,
-                                       struct Object *ob,
-                                       bGPDlayer *gpl,
-                                       bGPDframe *gpf,
-                                       int qi_begin,
-                                       int qi_end,
-                                       int material_nr,
-                                       struct Collection *col,
-                                       int types);
-
-#endif
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index c8de406ab62..5be7669cdda 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -49,8 +49,6 @@
 
 #include "ED_svg.h"
 
-#include "lanpr_access.h"
-
 extern LANPR_SharedResource lanpr_share;
 extern const char *RE_engine_id_BLENDER_LANPR;
 
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index b8b3ba44303..0699c1c9879 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -4,7 +4,6 @@
 #include "BLI_linklist.h"
 #include "BLI_math_matrix.h"
 #include "lanpr_all.h"
-#include "lanpr_access.h"
 #include "DRW_render.h"
 #include "BKE_object.h"
 #include "DNA_mesh_types.h"
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index f5f480da7b6..17882f9dc5e 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -48,9 +48,8 @@ typedef enum GpencilModifierType {
   eGpencilModifierType_Mirror = 14,
   eGpencilModifierType_Armature = 15,
   eGpencilModifierType_Time = 16,
-  eGpencilModifierType_Sample = 17,
-  eGpencilModifierType_Length = 18,
-  eGpencilModifierType_Multiply = 19,
+  eGpencilModifierType_Length = 17,
+  eGpencilModifierType_Multiply = 18,
   NUM_GREASEPENCIL_MODIFIER_TYPES
 } GpencilModifierType;
 
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 3f6759899b3..40f9d5c7285 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2490,9 +2490,9 @@ void rna_lanpr_active_line_layer_set(PointerRNA *ptr, PointerRNA value)
   lanpr->active_layer = value.data;
 }
 
-extern bool ED_lanpr_dpix_shader_error();
+extern bool ED_lanpr_dpix_shader_error(void);
 
-static bool rna_lanpr_shader_error_get(PointerRNA *ptr)
+static bool rna_lanpr_shader_error_get(PointerRNA *UNUSED(ptr))
 {
   return ED_lanpr_dpix_shader_error();
 }



More information about the Bf-blender-cvs mailing list