[Bf-blender-cvs] [a331933] ui-preview-buttons: missed last commit
Campbell Barton
noreply at git.blender.org
Mon May 11 05:45:24 CEST 2015
Commit: a331933654ad86ab1d040c60be91d089c70a6d9f
Author: Campbell Barton
Date: Mon May 11 13:45:11 2015 +1000
Branches: ui-preview-buttons
https://developer.blender.org/rBa331933654ad86ab1d040c60be91d089c70a6d9f
missed last commit
===================================================================
M source/blender/blenkernel/BKE_icons.h
M source/blender/blenkernel/intern/icons.c
M source/blender/editors/interface/interface_icons.c
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_brush.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_icons.h b/source/blender/blenkernel/BKE_icons.h
index 0869f9a..9114886 100644
--- a/source/blender/blenkernel/BKE_icons.h
+++ b/source/blender/blenkernel/BKE_icons.h
@@ -97,7 +97,7 @@ struct PreviewImage *BKE_previewimg_create(void);
struct PreviewImage *BKE_previewimg_copy(struct PreviewImage *prv);
/* retrieve existing or create new preview image */
-struct PreviewImage *BKE_previewimg_id_get(struct ID *id);
+struct PreviewImage *BKE_previewimg_id_ensure(struct ID *id);
void BKE_previewimg_ensure(struct PreviewImage *prv, const int size);
diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c
index 7922b13..78c7de5 100644
--- a/source/blender/blenkernel/intern/icons.c
+++ b/source/blender/blenkernel/intern/icons.c
@@ -245,7 +245,7 @@ void BKE_previewimg_id_free(ID *id)
}
}
-PreviewImage *BKE_previewimg_id_get(ID *id)
+PreviewImage *BKE_previewimg_id_ensure(ID *id)
{
PreviewImage *prv_img = NULL;
@@ -430,7 +430,7 @@ void BKE_icon_changed(int id)
icon = BLI_ghash_lookup(gIcons, SET_INT_IN_POINTER(id));
if (icon) {
- PreviewImage *prv = BKE_previewimg_id_get((ID *)icon->obj);
+ PreviewImage *prv = BKE_previewimg_id_ensure((ID *)icon->obj);
/* all previews changed */
if (prv) {
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index ec69ad4..afd3f57 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -948,7 +948,7 @@ void ui_icon_ensure_deferred(const bContext *C, const int icon_id, const bool bi
if (di) {
if (di->type == ICON_TYPE_PREVIEW) {
- PreviewImage *prv = (icon->type != 0) ? BKE_previewimg_id_get((ID *)icon->obj) : icon->obj;
+ PreviewImage *prv = (icon->type != 0) ? BKE_previewimg_id_ensure((ID *)icon->obj) : icon->obj;
if (prv) {
const int size = big ? ICON_SIZE_PREVIEW : ICON_SIZE_ICON;
@@ -1008,7 +1008,7 @@ PreviewImage *UI_icon_to_preview(int icon_id)
DrawInfo *di = (DrawInfo *)icon->drawinfo;
if (di) {
if (di->type == ICON_TYPE_PREVIEW) {
- PreviewImage *prv = (icon->type != 0) ? BKE_previewimg_id_get((ID *)icon->obj) : icon->obj;
+ PreviewImage *prv = (icon->type != 0) ? BKE_previewimg_id_ensure((ID *)icon->obj) : icon->obj;
if (prv) {
return BKE_previewimg_copy(prv);
@@ -1222,7 +1222,7 @@ static void icon_draw_size(
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
else if (di->type == ICON_TYPE_PREVIEW) {
- PreviewImage *pi = (icon->type != 0) ? BKE_previewimg_id_get((ID *)icon->obj) : icon->obj;
+ PreviewImage *pi = (icon->type != 0) ? BKE_previewimg_id_ensure((ID *)icon->obj) : icon->obj;
if (pi) {
/* Do deferred loading/generation if needed. */
@@ -1252,7 +1252,7 @@ static void ui_id_preview_image_render_size(
void UI_id_icon_render(const bContext *C, Scene *scene, ID *id, const bool big, const bool use_job)
{
- PreviewImage *pi = BKE_previewimg_id_get(id);
+ PreviewImage *pi = BKE_previewimg_id_ensure(id);
if (pi) {
if (big)
@@ -1264,7 +1264,7 @@ void UI_id_icon_render(const bContext *C, Scene *scene, ID *id, const bool big,
static void ui_id_brush_render(const bContext *C, ID *id)
{
- PreviewImage *pi = BKE_previewimg_id_get(id);
+ PreviewImage *pi = BKE_previewimg_id_ensure(id);
enum eIconSizes i;
if (!pi)
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 7856d43..35d2c58 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -416,7 +416,7 @@ static void rna_ImagePreview_is_custom_set(PointerRNA *ptr, int value, enum eIco
PreviewImage *prv_img = (PreviewImage *)ptr->data;
if (id != NULL) {
- BLI_assert(prv_img == BKE_previewimg_id_get(id));
+ BLI_assert(prv_img == BKE_previewimg_id_ensure(id));
}
if ((value && (prv_img->flag[size] & PRV_USER_EDITED)) || (!value && !(prv_img->flag[size] & PRV_USER_EDITED))) {
@@ -439,7 +439,7 @@ static void rna_ImagePreview_size_get(PointerRNA *ptr, int *values, enum eIconSi
PreviewImage *prv_img = (PreviewImage *)ptr->data;
if (id != NULL) {
- BLI_assert(prv_img == BKE_previewimg_id_get(id));
+ BLI_assert(prv_img == BKE_previewimg_id_ensure(id));
}
BKE_previewimg_ensure(prv_img, size);
@@ -454,7 +454,7 @@ static void rna_ImagePreview_size_set(PointerRNA *ptr, const int *values, enum e
PreviewImage *prv_img = (PreviewImage *)ptr->data;
if (id != NULL) {
- BLI_assert(prv_img == BKE_previewimg_id_get(id));
+ BLI_assert(prv_img == BKE_previewimg_id_ensure(id));
}
BKE_previewimg_ensure(prv_img, size);
@@ -475,7 +475,7 @@ static int rna_ImagePreview_pixels_get_length(PointerRNA *ptr, int length[RNA_MA
PreviewImage *prv_img = (PreviewImage *)ptr->data;
if (id != NULL) {
- BLI_assert(prv_img == BKE_previewimg_id_get(id));
+ BLI_assert(prv_img == BKE_previewimg_id_ensure(id));
}
BKE_previewimg_ensure(prv_img, size);
@@ -491,7 +491,7 @@ static void rna_ImagePreview_pixels_get(PointerRNA *ptr, int *values, enum eIcon
PreviewImage *prv_img = (PreviewImage *)ptr->data;
if (id != NULL) {
- BLI_assert(prv_img == BKE_previewimg_id_get(id));
+ BLI_assert(prv_img == BKE_previewimg_id_ensure(id));
}
BKE_previewimg_ensure(prv_img, size);
@@ -505,7 +505,7 @@ static void rna_ImagePreview_pixels_set(PointerRNA *ptr, const int *values, enum
PreviewImage *prv_img = (PreviewImage *)ptr->data;
if (id != NULL) {
- BLI_assert(prv_img == BKE_previewimg_id_get(id));
+ BLI_assert(prv_img == BKE_previewimg_id_ensure(id));
}
memcpy(prv_img->rect[size], values, prv_img->w[size] * prv_img->h[size] * sizeof(unsigned int));
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index ff2c541..e9e4282 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -415,7 +415,7 @@ static void rna_Brush_icon_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Poi
br->id.icon_id = 0;
if (br->flag & BRUSH_CUSTOM_ICON) {
- BKE_previewimg_id_get(&br->id);
+ BKE_previewimg_id_ensure(&br->id);
BKE_icon_changed(BKE_icon_id_ensure(&br->id));
}
More information about the Bf-blender-cvs
mailing list