[Bf-blender-cvs] [60475b95490] master: Cleanup: remove various unused defines

Campbell Barton noreply at git.blender.org
Sat Feb 15 05:31:45 CET 2020


Commit: 60475b95490fa5242e50fdef490d069396ba27ea
Author: Campbell Barton
Date:   Sat Feb 15 12:24:23 2020 +1100
Branches: master
https://developer.blender.org/rB60475b95490fa5242e50fdef490d069396ba27ea

Cleanup: remove various unused defines

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

M	source/blender/blenkernel/BKE_effect.h
M	source/blender/blenkernel/BKE_mesh_mapping.h
M	source/blender/draw/engines/eevee/eevee_private.h
M	source/blender/draw/engines/gpencil/gpencil_engine.h
M	source/blender/editors/gizmo_library/gizmo_library_intern.h
M	source/blender/editors/space_file/file_intern.h
M	source/blender/windowmanager/WM_types.h

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

diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h
index 94e8f4304b8..f223d2488bb 100644
--- a/source/blender/blenkernel/BKE_effect.h
+++ b/source/blender/blenkernel/BKE_effect.h
@@ -165,7 +165,6 @@ float effector_falloff(struct EffectorData *eff,
 
 /* EffectedPoint->flag */
 #define PE_WIND_AS_SPEED 1
-#define PE_DYNAMIC_ROTATION 2
 #define PE_USE_NORMAL_DATA 4
 
 /* EffectorData->flag */
@@ -173,8 +172,6 @@ float effector_falloff(struct EffectorData *eff,
 
 /* ======== Simulation Debugging ======== */
 
-#define SIM_DEBUG_HASH_BASE 5381
-
 unsigned int BKE_sim_debug_data_hash(int i);
 unsigned int BKE_sim_debug_data_hash_combine(unsigned int kx, unsigned int ky);
 
diff --git a/source/blender/blenkernel/BKE_mesh_mapping.h b/source/blender/blenkernel/BKE_mesh_mapping.h
index 47eb4ef1423..65f090302be 100644
--- a/source/blender/blenkernel/BKE_mesh_mapping.h
+++ b/source/blender/blenkernel/BKE_mesh_mapping.h
@@ -244,13 +244,6 @@ int *BKE_mesh_calc_smoothgroups(const struct MEdge *medge,
                                 int *r_totgroup,
                                 const bool use_bitflags);
 
-/* No good (portable) way to have exported inlined functions... */
-#define BKE_MESH_TESSFACE_VINDEX_ORDER(_mf, _v) \
-  ((CHECK_TYPE_INLINE(_mf, MFace *), CHECK_TYPE_INLINE(&(_v), unsigned int *)), \
-   ((_mf->v1 == _v) ? \
-        0 : \
-        (_mf->v2 == _v) ? 1 : (_mf->v3 == _v) ? 2 : (_mf->v4 && _mf->v4 == _v) ? 3 : -1))
-
 /* use on looptri vertex values */
 #define BKE_MESH_TESSTRI_VINDEX_ORDER(_tri, _v) \
   ((CHECK_TYPE_ANY( \
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index e39cb430fe5..1850324887c 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -123,7 +123,6 @@ extern struct DrawEngineType draw_engine_eevee_type;
   } \
   ((void)0)
 
-#define MATERIAL_PREVIEW_MODE_ENABLED(v3d) ((v3d) && (v3d->shading.type == OB_MATERIAL))
 #define LOOK_DEV_OVERLAY_ENABLED(v3d) \
   ((v3d) && (v3d->shading.type == OB_MATERIAL) && ((v3d->flag2 & V3D_HIDE_OVERLAYS) == 0) && \
    (v3d->overlay.flag & V3D_OVERLAY_LOOK_DEV))
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 9d5b9d5f7c1..44a30260343 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -39,7 +39,6 @@ struct GPUBatch;
 struct GPUVertBuf;
 struct GPUVertFormat;
 
-#define GPENCIL_CACHE_BLOCK_SIZE 8
 #define GPENCIL_MAX_SHGROUPS 65536
 #define GPENCIL_GROUPS_BLOCK_SIZE 1024
 
@@ -50,8 +49,6 @@ struct GPUVertFormat;
 #define GPENCIL_COLOR_TEXTURE 1
 #define GPENCIL_COLOR_PATTERN 2
 
-#define GP_IS_CAMERAVIEW ((rv3d != NULL) && (rv3d->persp == RV3D_CAMOB && v3d->camera))
-
 /* *********** OBJECTS CACHE *********** */
 typedef struct tGPencilObjectCache_shgrp {
   /** type of blend (regular, add, mult, etc...) */
diff --git a/source/blender/editors/gizmo_library/gizmo_library_intern.h b/source/blender/editors/gizmo_library/gizmo_library_intern.h
index 35782ea8b95..31decb71c77 100644
--- a/source/blender/editors/gizmo_library/gizmo_library_intern.h
+++ b/source/blender/editors/gizmo_library/gizmo_library_intern.h
@@ -24,9 +24,6 @@
 #ifndef __GIZMO_LIBRARY_INTERN_H__
 #define __GIZMO_LIBRARY_INTERN_H__
 
-/* distance around which gizmos respond to input (and get highlighted) */
-#define GIZMO_HOTSPOT 14.0f
-
 /**
  * Data for common interactions. Used in gizmo_library_utils.c functions.
  */
diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h
index 5ed936bc749..30dff1362fa 100644
--- a/source/blender/editors/space_file/file_intern.h
+++ b/source/blender/editors/space_file/file_intern.h
@@ -33,13 +33,6 @@ struct SpaceFile;
 struct View2D;
 
 /* file_draw.c */
-#define TILE_BORDER_X (UI_UNIT_X / 4)
-#define TILE_BORDER_Y (UI_UNIT_Y / 4)
-
-/* ui geometry */
-#define IMASEL_BUTTONS_HEIGHT (UI_UNIT_Y * 2)
-#define IMASEL_BUTTONS_MARGIN (UI_UNIT_Y / 6)
-
 #define ATTRIBUTE_COLUMN_PADDING (0.5f * UI_UNIT_X)
 
 #define SMALL_SIZE_CHECK(_size) ((_size) < 64) /* Related to FileSelectParams.thumbnail_size. */
@@ -137,6 +130,5 @@ void file_execute_region_panels_register(struct ARegionType *art);
 
 /* file_utils.c */
 void file_tile_boundbox(const ARegion *ar, FileLayout *layout, const int file, rcti *r_bounds);
-void file_path_existing_or_default_root(char *dir);
 
 #endif /* __FILE_INTERN_H__ */
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 5870802d02b..c11d51acd2d 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -371,7 +371,6 @@ typedef struct wmNotifier {
 /* NC_LAMP Light */
 #define ND_LIGHTING (40 << 16)
 #define ND_LIGHTING_DRAW (41 << 16)
-#define ND_SKY (42 << 16)
 
 /* NC_WORLD World */
 #define ND_WORLD_DRAW (45 << 16)



More information about the Bf-blender-cvs mailing list