[Bf-blender-cvs] [de7f095] ui-preview-buttons: Minor edits (API naming)
Campbell Barton
noreply at git.blender.org
Mon May 11 05:12:31 CEST 2015
Commit: de7f09546f9bef5dfceef7786f57011b8b68c582
Author: Campbell Barton
Date: Mon May 11 13:04:45 2015 +1000
Branches: ui-preview-buttons
https://developer.blender.org/rBde7f09546f9bef5dfceef7786f57011b8b68c582
Minor edits (API naming)
===================================================================
M source/blender/makesrna/intern/rna_ID.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index cb58313..1527298 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -410,7 +410,7 @@ static void rna_Library_filepath_set(PointerRNA *ptr, const char *value)
/* ***** ImagePreview ***** */
-static void rna_Preview_is_custom_set(PointerRNA *ptr, int value, enum eIconSizes size)
+static void rna_ImagePreview_is_custom_set(PointerRNA *ptr, int value, enum eIconSizes size)
{
ID *id = ptr->id.data;
PreviewImage *prv_img = (PreviewImage *)ptr->data;
@@ -433,7 +433,7 @@ static void rna_Preview_is_custom_set(PointerRNA *ptr, int value, enum eIconSize
BKE_previewimg_clear_single(prv_img, size);
}
-static void rna_Preview_size_get(PointerRNA *ptr, int *values, enum eIconSizes size)
+static void rna_ImagePreview_size_get(PointerRNA *ptr, int *values, enum eIconSizes size)
{
ID *id = (ID *)ptr->id.data;
PreviewImage *prv_img = (PreviewImage *)ptr->data;
@@ -448,7 +448,7 @@ static void rna_Preview_size_get(PointerRNA *ptr, int *values, enum eIconSizes s
values[1] = prv_img->h[size];
}
-static void rna_Preview_size_set(PointerRNA *ptr, const int *values, enum eIconSizes size)
+static void rna_ImagePreview_size_set(PointerRNA *ptr, const int *values, enum eIconSizes size)
{
ID *id = (ID *)ptr->id.data;
PreviewImage *prv_img = (PreviewImage *)ptr->data;
@@ -469,7 +469,7 @@ static void rna_Preview_size_set(PointerRNA *ptr, const int *values, enum eIconS
prv_img->flag[size] |= (PRV_CHANGED | PRV_USER_EDITED);
}
-static int rna_Preview_pixels_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION], enum eIconSizes size)
+static int rna_ImagePreview_pixels_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION], enum eIconSizes size)
{
ID *id = ptr->id.data;
PreviewImage *prv_img = (PreviewImage *)ptr->data;
@@ -485,7 +485,7 @@ static int rna_Preview_pixels_get_length(PointerRNA *ptr, int length[RNA_MAX_ARR
return length[0];
}
-static void rna_Preview_pixels_get(PointerRNA *ptr, int *values, enum eIconSizes size)
+static void rna_ImagePreview_pixels_get(PointerRNA *ptr, int *values, enum eIconSizes size)
{
ID *id = ptr->id.data;
PreviewImage *prv_img = (PreviewImage *)ptr->data;
@@ -499,7 +499,7 @@ static void rna_Preview_pixels_get(PointerRNA *ptr, int *values, enum eIconSizes
memcpy(values, prv_img->rect[size], prv_img->w[size] * prv_img->h[size] * sizeof(unsigned int));
}
-static void rna_Preview_pixels_set(PointerRNA *ptr, const int *values, enum eIconSizes size)
+static void rna_ImagePreview_pixels_set(PointerRNA *ptr, const int *values, enum eIconSizes size)
{
ID *id = ptr->id.data;
PreviewImage *prv_img = (PreviewImage *)ptr->data;
@@ -512,67 +512,67 @@ static void rna_Preview_pixels_set(PointerRNA *ptr, const int *values, enum eIco
prv_img->flag[size] |= PRV_USER_EDITED;
}
-static void rna_Preview_image_is_custom_set(PointerRNA *ptr, int value)
+static void rna_ImagePreview_image_is_custom_set(PointerRNA *ptr, int value)
{
- rna_Preview_is_custom_set(ptr, value, ICON_SIZE_PREVIEW);
+ rna_ImagePreview_is_custom_set(ptr, value, ICON_SIZE_PREVIEW);
}
-static void rna_Preview_image_size_get(PointerRNA *ptr, int *values)
+static void rna_ImagePreview_image_size_get(PointerRNA *ptr, int *values)
{
- rna_Preview_size_get(ptr, values, ICON_SIZE_PREVIEW);
+ rna_ImagePreview_size_get(ptr, values, ICON_SIZE_PREVIEW);
}
-static void rna_Preview_image_size_set(PointerRNA *ptr, const int *values)
+static void rna_ImagePreview_image_size_set(PointerRNA *ptr, const int *values)
{
- rna_Preview_size_set(ptr, values, ICON_SIZE_PREVIEW);
+ rna_ImagePreview_size_set(ptr, values, ICON_SIZE_PREVIEW);
}
-static int rna_Preview_image_pixels_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
+static int rna_ImagePreview_image_pixels_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
{
- return rna_Preview_pixels_get_length(ptr, length, ICON_SIZE_PREVIEW);
+ return rna_ImagePreview_pixels_get_length(ptr, length, ICON_SIZE_PREVIEW);
}
-static void rna_Preview_image_pixels_get(PointerRNA *ptr, int *values)
+static void rna_ImagePreview_image_pixels_get(PointerRNA *ptr, int *values)
{
- rna_Preview_pixels_get(ptr, values, ICON_SIZE_PREVIEW);
+ rna_ImagePreview_pixels_get(ptr, values, ICON_SIZE_PREVIEW);
}
-static void rna_Preview_image_pixels_set(PointerRNA *ptr, const int *values)
+static void rna_ImagePreview_image_pixels_set(PointerRNA *ptr, const int *values)
{
- rna_Preview_pixels_set(ptr, values, ICON_SIZE_PREVIEW);
+ rna_ImagePreview_pixels_set(ptr, values, ICON_SIZE_PREVIEW);
}
-static void rna_Preview_icon_is_custom_set(PointerRNA *ptr, int value)
+static void rna_ImagePreview_icon_is_custom_set(PointerRNA *ptr, int value)
{
- rna_Preview_is_custom_set(ptr, value, ICON_SIZE_ICON);
+ rna_ImagePreview_is_custom_set(ptr, value, ICON_SIZE_ICON);
}
-static void rna_Preview_icon_size_get(PointerRNA *ptr, int *values)
+static void rna_ImagePreview_icon_size_get(PointerRNA *ptr, int *values)
{
- rna_Preview_size_get(ptr, values, ICON_SIZE_ICON);
+ rna_ImagePreview_size_get(ptr, values, ICON_SIZE_ICON);
}
-static void rna_Preview_icon_size_set(PointerRNA *ptr, const int *values)
+static void rna_ImagePreview_icon_size_set(PointerRNA *ptr, const int *values)
{
- rna_Preview_size_set(ptr, values, ICON_SIZE_ICON);
+ rna_ImagePreview_size_set(ptr, values, ICON_SIZE_ICON);
}
-static int rna_Preview_icon_pixels_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
+static int rna_ImagePreview_icon_pixels_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
{
- return rna_Preview_pixels_get_length(ptr, length, ICON_SIZE_ICON);
+ return rna_ImagePreview_pixels_get_length(ptr, length, ICON_SIZE_ICON);
}
-static void rna_Preview_icon_pixels_get(PointerRNA *ptr, int *values)
+static void rna_ImagePreview_icon_pixels_get(PointerRNA *ptr, int *values)
{
- rna_Preview_pixels_get(ptr, values, ICON_SIZE_ICON);
+ rna_ImagePreview_pixels_get(ptr, values, ICON_SIZE_ICON);
}
-static void rna_Preview_icon_pixels_set(PointerRNA *ptr, const int *values)
+static void rna_ImagePreview_icon_pixels_set(PointerRNA *ptr, const int *values)
{
- rna_Preview_pixels_set(ptr, values, ICON_SIZE_ICON);
+ rna_ImagePreview_pixels_set(ptr, values, ICON_SIZE_ICON);
}
-static int rna_Preview_icon_id_get(PointerRNA *ptr)
+static int rna_ImagePreview_icon_id_get(PointerRNA *ptr)
{
/* Using a callback here allows us to only generate icon matching that preview when icon_id is requested. */
return BKE_icon_preview_get((PreviewImage *)(ptr->data));
@@ -695,7 +695,7 @@ static void rna_def_ID_materials(BlenderRNA *brna)
RNA_def_boolean(func, "update_data", 0, "", "Update data by re-adjusting the material slots assigned");
}
-static void rna_def_preview(BlenderRNA *brna)
+static void rna_def_image_preview(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
@@ -706,45 +706,45 @@ static void rna_def_preview(BlenderRNA *brna)
prop = RNA_def_property(srna, "image_is_custom", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag[ICON_SIZE_PREVIEW]", PRV_USER_EDITED);
- RNA_def_property_boolean_funcs(prop, NULL, "rna_Preview_image_is_custom_set");
+ RNA_def_property_boolean_funcs(prop, NULL, "rna_ImagePreview_image_is_custom_set");
RNA_def_property_ui_text(prop, "Custom Image", "True if this preview image has been modified by py script,"
"and is no more auto-generated by Blender");
prop = RNA_def_int_vector(srna, "image_size", 2, NULL, 0, 0, "Image Size",
"Width and height in pixels", 0, 0);
RNA_def_property_subtype(prop, PROP_PIXEL);
- RNA_def_property_int_funcs(prop, "rna_Preview_image_size_get", "rna_Preview_image_size_set", NULL);
+ RNA_def_property_int_funcs(prop, "rna_ImagePreview_image_size_get", "rna_ImagePreview_image_size_set", NULL);
prop = RNA_def_property(srna, "image_pixels", PROP_INT, PROP_NONE);
RNA_def_property_flag(prop, PROP_DYNAMIC);
RNA_def_property_multi_array(prop, 1, NULL);
RNA_def_property_ui_text(prop, "Image Pixels", "Image pixels, as bytes (always RGBA 32bits)");
- RNA_def_property_dynamic_array_funcs(prop, "rna_Preview_image_pixels_get_length");
- RNA_def_property_int_funcs(prop, "rna_Preview_image_pixels_get", "rna_Preview_image_pixels_set", NULL);
+ RNA_def_property_dynamic_array_funcs(prop, "rna_ImagePreview_image_pixels_get_length");
+ RNA_def_property_int_funcs(prop, "rna_ImagePreview_image_pixels_get", "rna_ImagePreview_image_pixels_set", NULL);
prop = RNA_def_property(srna, "icon_is_custom", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag[ICON_SIZE_ICON]", PRV_USER_EDITED);
- RNA_def_property_boolean_funcs(prop, NULL, "rna_Preview_icon_is_custom_set");
+ RNA_def_property_boolean_funcs(prop, NULL, "rna_ImagePreview_icon_is_custom_set");
RNA_def_property_ui_text(prop, "Custom Icon", "True if this preview icon has been modified by py script,"
"and is no more auto-generated by Blender");
prop = RNA_def_int_vector(srna, "icon_size", 2, NULL, 0, 0, "Icon Size",
"Width and height in pixels", 0, 0);
RNA_def_property_subtype(prop, PROP_PIXEL);
- RNA_def_property_int_funcs(prop, "rna_Preview_icon_size_get", "rna_Preview_icon_size_set", NULL);
+ RNA_def_property_int_funcs(prop, "rna_ImagePreview_icon_size_get", "rna_ImagePreview_icon_size_set", NULL);
prop = RNA_def_property(srna, "icon_pixels", PROP_INT, PROP_NONE);
RNA_def_property_flag(prop, PROP_DYNAMIC);
RNA_def_property_multi_array(prop, 1, NULL);
RNA_def_property_ui_text(prop, "Icon Pixels", "Icon pixels, as bytes (always RGBA 32bits)");
- RNA_def_property_dynamic_array_funcs(prop, "rna_Preview_icon_pixels_get_length");
- RNA_def_property_int_funcs(prop, "rna_Preview_icon_pixels_get", "rna_Preview_icon_pixels_set", NULL);
+ RNA_def_property_dynamic_array_funcs(prop, "rna_ImagePreview_icon_pixels_get_length");
+ RNA_def_property_int_funcs(prop, "rna_ImagePreview_icon_pixels_get", "rna_ImagePreview_icon_pixels_set
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list