From 53ac3192ba07c4271c86479186ed0d0b8cd7846f Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Wed, 28 Sep 2022 15:50:09 -0700 Subject: Cleanup: remove duplicate declaration Also got rid of ATTR_NO_OPT macro. --- source/blender/blenkernel/BKE_customdata.h | 1 - source/blender/draw/intern/draw_pbvh.cc | 14 +------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 0e172abd9a2..22e4a2bce87 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -450,7 +450,6 @@ int CustomData_get_stencil_layer(const struct CustomData *data, int type); * if no such active layer is defined. */ const char *CustomData_get_active_layer_name(const struct CustomData *data, int type); -const char *CustomData_get_render_layer_name(const struct CustomData *data, int type); /** * Returns name of the default layer of the given type or NULL diff --git a/source/blender/draw/intern/draw_pbvh.cc b/source/blender/draw/intern/draw_pbvh.cc index 126ba98d06c..11788e3d044 100644 --- a/source/blender/draw/intern/draw_pbvh.cc +++ b/source/blender/draw/intern/draw_pbvh.cc @@ -8,17 +8,6 @@ * used by mesh sculpt mode. */ -/* Disable optimization for a function (for debugging use only!)*/ -#ifdef __clang__ -# define ATTR_NO_OPT __attribute__((optnone)) -#elif defined(_MSC_VER) -# define ATTR_NO_OPT __pragma(optimize("", off)) -#elif defined(__GNUC__) -# define ATTR_NO_OPT __attribute__((optimize("O0"))) -#else -# define ATTR_NO_OPT -#endif - #include #include #include @@ -48,9 +37,9 @@ #include "DRW_engine.h" #include "DRW_pbvh.h" +#include "bmesh.h" #include "draw_pbvh.h" #include "gpu_private.h" -#include "bmesh.h" #define MAX_PBVH_BATCH_KEY 512 #define MAX_PBVH_VBOS 16 @@ -493,7 +482,6 @@ struct PBVHBatches { } } - ATTR_NO_OPT void fill_vbo_faces(PBVHVbo &vbo, PBVH_GPU_Args *args) { int totvert = args->totprim * 3; -- cgit v1.2.3