[Bf-blender-cvs] [c6692014cf6] master: Fix redundant declaration warning

[Julian Eisel]

Commit: c6692014cf604a698245158615b4d10b057f12da
Author: Julian Eisel
Date:   Tue Dec 15 17:19:55 2020 +0100
Branches: master
https://developer.blender.org/rBc6692014cf604a698245158615b4d10b057f12da

Fix redundant declaration warning

Function was declared twice (caused by merge conflicts) which GCC would
rightfully complain about.

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

M	source/blender/blenkernel/BKE_icons.h

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

diff --git a/source/blender/blenkernel/BKE_icons.h b/source/blender/blenkernel/BKE_icons.h
index 5ceba4c717f..28a6f837f61 100644
--- a/source/blender/blenkernel/BKE_icons.h
+++ b/source/blender/blenkernel/BKE_icons.h
@@ -146,8 +146,6 @@ void BKE_previewimg_clear_single(struct PreviewImage *prv, enum eIconSizes size)
 struct PreviewImage **BKE_previewimg_id_get_p(const struct ID *id);
 struct PreviewImage *BKE_previewimg_id_get(const struct ID *id);
 
-void BKE_previewimg_id_custom_set(struct ID *id, const char *path);
-
 bool BKE_previewimg_id_supports_jobs(const struct ID *id);
 
 /* Trigger deferred loading of a custom image file into the preview buffer. */