blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Cleanup: rename `BaseOffset` to `ObjectOffsets`

This commit is contained in:
Germano Cavalcante 2019-08-12 12:29:18 -03:00
parent 4815bd7748
commit b5f5f6e319
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/draw/DRW_select_buffer.h
View File

@ -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`. */

3
source/blender/draw/engines/select/select_engine.c
View File

@ -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;

4
source/blender/draw/intern/draw_select_buffer.c
View File

@ -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;