diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-04-05 12:02:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-04-05 12:02:39 +0300 |
| commit | 249077901320a006398a8ad55a73cb6717d5df39 (patch) | |
| tree | da1bf6306d8ade3677374dd45b0717d031b07fad | |
| parent | 8b55e0e8778da53c88bfc6f58973c010f141b024 (diff) | |
Correct merge error
| -rw-r--r-- | source/blender/blenkernel/intern/icons.c | 5 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_ghash.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c index 45ebada4d81..f3e86b44459 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 f13e8cb2ae8..873ee4fa035 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, |