Commit: 249077901320a006398a8ad55a73cb6717d5df39
Author: Campbell Barton
Date: Tue Apr 5 19:02:39 2016 +1000
Branches: blender-v2.77-release
https://developer.blender.org/rB249077901320a006398a8ad55a73cb6717d5df39
Correct merge error
===================================================================
M source/blender/blenkernel/intern/icons.c
M source/blender/blenlib/BLI_ghash.h
===================================================================
diff --git a/source/blender/blenkernel/intern/icons.c
b/source/blender/blenkernel/intern/icons.c
index 45ebada..f3e86b4 100644
--- a/source/blender/blenkernel/intern/icons.c
+++ b/source/blender/blenkernel/intern/icons.c
@@ -273,9 +273,10 @@ PreviewImage *BKE_previewimg_cached_get(const char *name)
PreviewImage *BKE_previewimg_cached_ensure(const char *name)
{
PreviewImage *prv = NULL;
- void **prv_p;
+ void **key_p, **prv_p;
- if (!BLI_ghash_ensure_p_ex(gCachedPreviews, name, &prv_p,
(GHashKeyCopyFP)BLI_strdup)) {
+ if (!BLI_ghash_ensure_p_ex(gCachedPreviews, name, &key_p, &prv_p)) {
+ *key_p = BLI_strdup(name);
*prv_p = BKE_previewimg_create();
}
prv = *prv_p;
diff --git a/source/blender/blenlib/BLI_ghash.h
b/source/blender/blenlib/BLI_ghash.h
index f13e8cb..873ee4f 100644
--- a/source/blender/blenlib/BLI_ghash.h
+++ b/source/blender/blenlib/BLI_ghash.h
@@ -94,7 +94,7 @@ void *BLI_ghash_lookup(GHash *gh, const void *key)
ATTR_WARN_UNUSED_RESULT;
void *BLI_ghash_lookup_default(GHash *gh, const void *key, void *val_default)
ATTR_WARN_UNUSED_RESULT;
void **BLI_ghash_lookup_p(GHash *gh, const void *key) ATTR_WARN_UNUSED_RESULT;
bool BLI_ghash_ensure_p(GHash *gh, void *key, void ***r_val)
ATTR_WARN_UNUSED_RESULT;
-bool BLI_ghash_ensure_p_ex(GHash *gh, const void *key, void ***r_val,
GHashKeyCopyFP keycopyfp) ATTR_WARN_UNUSED_RESULT;
+bool BLI_ghash_ensure_p_ex(GHash *gh, const void *key, void ***r_key, void
***r_val) ATTR_WARN_UNUSED_RESULT;
bool BLI_ghash_remove(GHash *gh, const void *key, GHashKeyFreeFP keyfreefp,
GHashValFreeFP valfreefp);
void BLI_ghash_clear(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP
valfreefp);
void BLI_ghash_clear_ex(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP
valfreefp,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
