[Bf-blender-cvs] [f3ae50c7651] asset-uuid: Rename some variables in AssetUUID struct.

[Bastien Montagne]

Commit: f3ae50c76511816b4a1b69a253b6843843e3490d
Author: Bastien Montagne
Date:   Tue Nov 26 17:59:51 2019 +0100
Branches: asset-uuid
https://developer.blender.org/rBf3ae50c76511816b4a1b69a253b6843843e3490d

Rename some variables in AssetUUID struct.

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

M	source/blender/blenkernel/intern/asset_engine.c
M	source/blender/makesdna/DNA_ID.h
M	source/blender/makesrna/intern/rna_asset.c

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

diff --git a/source/blender/blenkernel/intern/asset_engine.c b/source/blender/blenkernel/intern/asset_engine.c
index cc01bfe38e7..b309db81f88 100644
--- a/source/blender/blenkernel/intern/asset_engine.c
+++ b/source/blender/blenkernel/intern/asset_engine.c
@@ -50,8 +50,8 @@
 
 /* Various helpers */
 void BKE_asset_uuid_runtime_reset(AssetUUID *uuid) {
-  uuid->ibuff = NULL;
-  uuid->width = uuid->height = 0;
+  uuid->preview_image_buffer = NULL;
+  uuid->preview_width = uuid->preview_height = 0;
   uuid->tag = 0;
   uuid->id = NULL;
 }
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 3ea45168f45..6609625c50e 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -256,9 +256,9 @@ typedef struct AssetUUID {
   short tag;
 
   /* Preview. */
-  short width;
-  short height;
-  char *ibuff; /* RGBA 8bits. */
+  short preview_width;
+  short preview_height;
+  char *preview_image_buffer; /* RGBA 8bits. */
 
   /* Used for load_post and other temporary storage of the ID itself in its AssetUUID.
    * Usage and scope are similar to the `ID.newid` pointer. */
diff --git a/source/blender/makesrna/intern/rna_asset.c b/source/blender/makesrna/intern/rna_asset.c
index c445820198d..9edb623914b 100644
--- a/source/blender/makesrna/intern/rna_asset.c
+++ b/source/blender/makesrna/intern/rna_asset.c
@@ -46,18 +46,18 @@ static void rna_AssetUUID_preview_size_get(PointerRNA *ptr, int *values)
 {
   AssetUUID *uuid = ptr->data;
 
-  values[0] = uuid->width;
-  values[1] = uuid->height;
+  values[0] = uuid->preview_width;
+  values[1] = uuid->preview_height;
 }
 
 static void rna_AssetUUID_preview_size_set(PointerRNA *ptr, const int *values)
 {
   AssetUUID *uuid = ptr->data;
 
-  uuid->width = values[0];
-  uuid->height = values[1];
+  uuid->preview_width = values[0];
+  uuid->preview_height = values[1];
 
-  MEM_SAFE_FREE(uuid->ibuff);
+  MEM_SAFE_FREE(uuid->preview_image_buffer);
 }
 
 static int rna_AssetUUID_preview_pixels_get_length(PointerRNA *ptr,
@@ -65,7 +65,7 @@ static int rna_AssetUUID_preview_pixels_get_length(PointerRNA *ptr,
 {
   AssetUUID *uuid = ptr->data;
 
-  length[0] = (uuid->ibuff == NULL) ? 0 : uuid->width * uuid->height;
+  length[0] = (uuid->preview_image_buffer == NULL) ? 0 : uuid->preview_width * uuid->preview_height;
 
   return length[0];
 }
@@ -74,18 +74,18 @@ static void rna_AssetUUID_preview_pixels_get(PointerRNA *ptr, int *values)
 {
   AssetUUID *uuid = ptr->data;
 
-  memcpy(values, uuid->ibuff, uuid->width * uuid->height * sizeof(unsigned int));
+  memcpy(values, uuid->preview_image_buffer, uuid->preview_width * uuid->preview_height * sizeof(unsigned int));
 }
 
 static void rna_AssetUUID_preview_pixels_set(PointerRNA *ptr, const int *values)
 {
   AssetUUID *uuid = ptr->data;
 
-  if (!uuid->ibuff) {
-    uuid->ibuff = MEM_mallocN(sizeof(*uuid->ibuff) * 4 * uuid->width * uuid->height, __func__);
+  if (!uuid->preview_image_buffer) {
+    uuid->preview_image_buffer = MEM_mallocN(sizeof(*uuid->preview_image_buffer) * 4 * uuid->preview_width * uuid->preview_height, __func__);
   }
 
-  memcpy(uuid->ibuff, values, uuid->width * uuid->height * sizeof(unsigned int));
+  memcpy(uuid->preview_image_buffer, values, uuid->preview_width * uuid->preview_height * sizeof(unsigned int));
 }
 
 #else /* RNA_RUNTIME */