[Bf-blender-cvs] [b5f5f6e319b] master: Cleanup: rename `BaseOffset` to `ObjectOffsets`

mano-wii noreply at git.blender.org
Mon Aug 12 17:31:33 CEST 2019


Commit: b5f5f6e319b21be4c5855906afdcc5c6093ab71d
Author: mano-wii
Date:   Mon Aug 12 12:29:18 2019 -0300
Branches: master
https://developer.blender.org/rBb5f5f6e319b21be4c5855906afdcc5c6093ab71d

Cleanup: rename `BaseOffset` to `ObjectOffsets`

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

M	source/blender/draw/DRW_select_buffer.h
M	source/blender/draw/engines/select/select_engine.c
M	source/blender/draw/intern/draw_select_buffer.c

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

diff --git a/source/blender/draw/DRW_select_buffer.h b/source/blender/draw/DRW_select_buffer.h
index 48fdbdfd803..ff40508b1a1 100644
--- a/source/blender/draw/DRW_select_buffer.h
+++ b/source/blender/draw/DRW_select_buffer.h
@@ -33,7 +33,7 @@ struct View3D;
 struct ViewLayer;
 struct rcti;
 
-struct BaseOffset {
+struct ObjectOffsets {
   /* For convenience only. */
   union {
     uint offset;
@@ -54,7 +54,7 @@ struct SELECTID_Context {
   struct GPUFrameBuffer *framebuffer_select_id;
   struct GPUTexture *texture_u32;
 
-  struct BaseOffset *index_offsets;
+  struct ObjectOffsets *index_offsets;
   uint objects_len;
   uint last_object_drawn;
   /** Total number of items `base_array_index_offsets[bases_len - 1].vert`. */
diff --git a/source/blender/draw/engines/select/select_engine.c b/source/blender/draw/engines/select/select_engine.c
index 83f6563ab53..67e926452b9 100644
--- a/source/blender/draw/engines/select/select_engine.c
+++ b/source/blender/draw/engines/select/select_engine.c
@@ -164,7 +164,8 @@ static void select_cache_init(void *vedata)
 static void select_cache_populate(void *vedata, Object *ob)
 {
   const DRWContextState *draw_ctx = DRW_context_state_get();
-  struct BaseOffset *base_ofs = &e_data.context.index_offsets[e_data.context.last_object_drawn++];
+  struct ObjectOffsets *base_ofs =
+      &e_data.context.index_offsets[e_data.context.last_object_drawn++];
 
   uint offset = e_data.context.last_index_drawn;
 
diff --git a/source/blender/draw/intern/draw_select_buffer.c b/source/blender/draw/intern/draw_select_buffer.c
index 1a763a527aa..cd876b7b068 100644
--- a/source/blender/draw/intern/draw_select_buffer.c
+++ b/source/blender/draw/intern/draw_select_buffer.c
@@ -405,7 +405,7 @@ bool DRW_select_buffer_elem_get(const uint sel_id,
   uint base_index = 0;
 
   for (; base_index < select_ctx->objects_len; base_index++) {
-    struct BaseOffset *base_ofs = &select_ctx->index_offsets[base_index];
+    struct ObjectOffsets *base_ofs = &select_ctx->index_offsets[base_index];
 
     if (base_ofs->face > sel_id) {
       elem_id = sel_id - base_ofs->face_start;
@@ -444,7 +444,7 @@ bool DRW_select_buffer_elem_get(const uint sel_id,
 uint DRW_select_buffer_context_offset_for_object_elem(const uint base_index, char elem_type)
 {
   struct SELECTID_Context *select_ctx = DRW_select_engine_context_get();
-  struct BaseOffset *base_ofs = &select_ctx->index_offsets[base_index];
+  struct ObjectOffsets *base_ofs = &select_ctx->index_offsets[base_index];
 
   if (elem_type == SCE_SELECT_VERTEX) {
     return base_ofs->vert_start - 1;



More information about the Bf-blender-cvs mailing list