diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-02 05:39:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-02 05:49:13 +0300 |
| commit | afcbf7cf1357723f59eca8e118a0ca9ef6cf6555 (patch) | |
| tree | 95c520cd1e556f3cf1fa0a799bc23efe649cf22c /source/blender/draw/intern | |
| parent | a53011d52012067ad1334d654a68c97327005626 (diff) | |
Cleanup: use G_FLAG_*/G_FILE_* for G.f/fileflags
Was confusing eg: G_AUTOPACK belonged to G.fileflags, G_PICKSEL to G.f.
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 10 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager_exec.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index f4c0df61f13..5c14a10101c 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -594,7 +594,7 @@ void DRW_shgroup_call_sculpt_add(DRWShadingGroup *shgroup, Object *ob, float (*o void DRW_shgroup_call_dynamic_add_array(DRWShadingGroup *shgroup, const void *attr[], uint attr_len) { #ifdef USE_GPU_SELECT - if (G.f & G_PICKSEL) { + if (G.f & G_FLAG_PICKSEL) { if (shgroup->instance_count == shgroup->inst_selectid->vertex_len) { GPU_vertbuf_data_resize(shgroup->inst_selectid, shgroup->instance_count + 32); } @@ -711,7 +711,7 @@ static void drw_shgroup_instance_init( &shgroup->instance_geom, &shgroup->instance_vbo); #ifdef USE_GPU_SELECT - if (G.f & G_PICKSEL) { + if (G.f & G_FLAG_PICKSEL) { /* Not actually used for rendering but alloced in one chunk. * Plus we don't have to care about ownership. */ static GPUVertFormat inst_select_format = {0}; @@ -748,7 +748,7 @@ static void drw_shgroup_batching_init( &shgroup->batch_geom, &shgroup->batch_vbo); #ifdef USE_GPU_SELECT - if (G.f & G_PICKSEL) { + if (G.f & G_FLAG_PICKSEL) { /* Not actually used for rendering but alloced in one chunk. */ static GPUVertFormat inst_select_format = {0}; if (inst_select_format.attr_len == 0) { @@ -887,7 +887,7 @@ DRWShadingGroup *DRW_shgroup_material_empty_tri_batch_create( struct GPUMaterial *material, DRWPass *pass, int tri_count) { #ifdef USE_GPU_SELECT - BLI_assert((G.f & G_PICKSEL) == 0); + BLI_assert((G.f & G_FLAG_PICKSEL) == 0); #endif GPUPass *gpupass = GPU_material_get_pass(material); DRWShadingGroup *shgroup = drw_shgroup_material_create_ex(gpupass, pass); @@ -960,7 +960,7 @@ DRWShadingGroup *DRW_shgroup_line_batch_create(struct GPUShader *shader, DRWPass DRWShadingGroup *DRW_shgroup_empty_tri_batch_create(struct GPUShader *shader, DRWPass *pass, int tri_count) { #ifdef USE_GPU_SELECT - BLI_assert((G.f & G_PICKSEL) == 0); + BLI_assert((G.f & G_FLAG_PICKSEL) == 0); #endif DRWShadingGroup *shgroup = drw_shgroup_create_ex(shader, pass); diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 22b477327cc..8147da90899 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -38,7 +38,7 @@ #ifdef USE_GPU_SELECT void DRW_select_load_id(uint id) { - BLI_assert(G.f & G_PICKSEL); + BLI_assert(G.f & G_FLAG_PICKSEL); DST.select_id = id; } #endif @@ -1131,12 +1131,12 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state) #ifdef USE_GPU_SELECT # define GPU_SELECT_LOAD_IF_PICKSEL(_select_id) \ - if (G.f & G_PICKSEL) { \ + if (G.f & G_FLAG_PICKSEL) { \ GPU_select_load_id(_select_id); \ } ((void)0) # define GPU_SELECT_LOAD_IF_PICKSEL_CALL(_call) \ - if ((G.f & G_PICKSEL) && (_call)) { \ + if ((G.f & G_FLAG_PICKSEL) && (_call)) { \ GPU_select_load_id((_call)->select_id); \ } ((void)0) @@ -1144,7 +1144,7 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state) _start = 0; \ _count = _shgroup->instance_count; \ int *select_id = NULL; \ - if (G.f & G_PICKSEL) { \ + if (G.f & G_FLAG_PICKSEL) { \ if (_shgroup->override_selectid == -1) { \ /* Hack : get vbo data without actually drawing. */ \ GPUVertBufRaw raw; \ |