diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-04-22 08:53:11 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-22 08:53:11 +0300 |
commit | 36b29c05db52d5f4e967e14d357f2a9c82c45149 (patch) | |
tree | dc4a222441f0b5f23385ac268d1838eed19187dd | |
parent | 9fe9cf826107ca5c2169e0f2b04defff81b455fa (diff) |
Cleanup: use DRW_shgroup_call prefix for dynamic and fixed
More useful for completion since an 'shgroup_dynamic' is not a thing
(would be confusing if other dynamic functions are added).
-rw-r--r-- | source/blender/draw/engines/eevee/eevee.c | 6 | ||||
-rw-r--r-- | source/blender/draw/intern/DRW_render.h | 10 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_armature.c | 14 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 18 | ||||
-rw-r--r-- | source/blender/draw/modes/object_mode.c | 94 |
5 files changed, 71 insertions, 71 deletions
diff --git a/source/blender/draw/engines/eevee/eevee.c b/source/blender/draw/engines/eevee/eevee.c index d60a85ddebb..0c4fbb4b46b 100644 --- a/source/blender/draw/engines/eevee/eevee.c +++ b/source/blender/draw/engines/eevee/eevee.c @@ -299,7 +299,7 @@ static DRWShadingGroup *eevee_cube_shgroup(struct GPUShader *sh, DRWPass *pass, DRWShadingGroup *grp = DRW_shgroup_instance_create(sh, pass, geom); for (int i = 0; i < 6; ++i) - DRW_shgroup_dynamic_call_add_empty(grp); + DRW_shgroup_call_dynamic_add_empty(grp); return grp; } @@ -311,7 +311,7 @@ static DRWShadingGroup *eevee_cube_shadow_shgroup(EEVEE_PassList *psl, EEVEE_Sto DRW_shgroup_uniform_mat4(grp, "ShadowModelMatrix", (float *)obmat); for (int i = 0; i < 6; ++i) - DRW_shgroup_dynamic_call_add_empty(grp); + DRW_shgroup_call_dynamic_add_empty(grp); return grp; } @@ -323,7 +323,7 @@ static DRWShadingGroup *eevee_cascade_shadow_shgroup(EEVEE_PassList *psl, EEVEE_ DRW_shgroup_uniform_mat4(grp, "ShadowModelMatrix", (float *)obmat); for (int i = 0; i < MAX_CASCADE_NUM; ++i) - DRW_shgroup_dynamic_call_add_empty(grp); + DRW_shgroup_call_dynamic_add_empty(grp); return grp; } diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 765ce2934fe..234f29b3fb5 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -245,13 +245,13 @@ DRWShadingGroup *DRW_shgroup_line_batch_create(struct GPUShader *shader, DRWPass void DRW_shgroup_free(struct DRWShadingGroup *shgroup); void DRW_shgroup_call_add(DRWShadingGroup *shgroup, struct Batch *geom, float (*obmat)[4]); -void DRW_shgroup_dynamic_call_add_array(DRWShadingGroup *shgroup, const void *attr[], unsigned int attr_len); -#define DRW_shgroup_dynamic_call_add(shgroup, ...) do { \ +void DRW_shgroup_call_dynamic_add_array(DRWShadingGroup *shgroup, const void *attr[], unsigned int attr_len); +#define DRW_shgroup_call_dynamic_add(shgroup, ...) do { \ const void *array[] = {__VA_ARGS__}; \ - DRW_shgroup_dynamic_call_add_array(shgroup, array, (sizeof(array) / sizeof(*array))); \ + DRW_shgroup_call_dynamic_add_array(shgroup, array, (sizeof(array) / sizeof(*array))); \ } while (0) -#define DRW_shgroup_dynamic_call_add_empty(shgroup) do { \ - DRW_shgroup_dynamic_call_add_array(shgroup, NULL, 0); \ +#define DRW_shgroup_call_dynamic_add_empty(shgroup) do { \ + DRW_shgroup_call_dynamic_add_array(shgroup, NULL, 0); \ } while (0) void DRW_shgroup_state_set(DRWShadingGroup *shgroup, DRWState state); diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c index 1fb2eaffb79..2e4a4cd0f5e 100644 --- a/source/blender/draw/intern/draw_armature.c +++ b/source/blender/draw/intern/draw_armature.c @@ -82,7 +82,7 @@ static void DRW_shgroup_bone_octahedral_solid(const float (*bone_mat)[4], const bone_octahedral_solid = shgroup_instance_objspace_solid(bone_solid, geom, current_armature->obmat); } - DRW_shgroup_dynamic_call_add(bone_octahedral_solid, bone_mat, color); + DRW_shgroup_call_dynamic_add(bone_octahedral_solid, bone_mat, color); } static void DRW_shgroup_bone_octahedral_wire(const float (*bone_mat)[4], const float color[4]) @@ -92,7 +92,7 @@ static void DRW_shgroup_bone_octahedral_wire(const float (*bone_mat)[4], const f bone_octahedral_wire = shgroup_instance_objspace_wire(bone_wire, geom, current_armature->obmat); } - DRW_shgroup_dynamic_call_add(bone_octahedral_wire, bone_mat, color); + DRW_shgroup_call_dynamic_add(bone_octahedral_wire, bone_mat, color); } /* Head and tail sphere */ @@ -103,7 +103,7 @@ static void DRW_shgroup_bone_point_solid(const float (*bone_mat)[4], const float bone_point_solid = shgroup_instance_objspace_solid(bone_solid, geom, current_armature->obmat); } - DRW_shgroup_dynamic_call_add(bone_point_solid, bone_mat, color); + DRW_shgroup_call_dynamic_add(bone_point_solid, bone_mat, color); } static void DRW_shgroup_bone_point_wire(const float (*bone_mat)[4], const float color[4]) @@ -113,7 +113,7 @@ static void DRW_shgroup_bone_point_wire(const float (*bone_mat)[4], const float bone_point_wire = shgroup_instance_objspace_wire(bone_wire, geom, current_armature->obmat); } - DRW_shgroup_dynamic_call_add(bone_point_wire, bone_mat, color); + DRW_shgroup_call_dynamic_add(bone_point_wire, bone_mat, color); } /* Axes */ @@ -124,14 +124,14 @@ static void DRW_shgroup_bone_axes(const float (*bone_mat)[4], const float color[ bone_axes = shgroup_instance_objspace_wire(bone_wire, geom, current_armature->obmat); } - DRW_shgroup_dynamic_call_add(bone_axes, bone_mat, color); + DRW_shgroup_call_dynamic_add(bone_axes, bone_mat, color); } /* Relationship lines */ static void UNUSED_FUNCTION(DRW_shgroup_bone_relationship_lines)(const float head[3], const float tail[3]) { - DRW_shgroup_dynamic_call_add(relationship_lines, head); - DRW_shgroup_dynamic_call_add(relationship_lines, tail); + DRW_shgroup_call_dynamic_add(relationship_lines, head); + DRW_shgroup_call_dynamic_add(relationship_lines, tail); } /* *************** Armature Drawing - Coloring API ***************************** */ diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 66e44edc63d..e102a4c52d2 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -158,17 +158,17 @@ typedef struct DRWCall { float (*obmat)[4]; } DRWCall; -typedef struct DRWDynamicCall { - struct DRWDynamicCall *next, *prev; +typedef struct DRWCallDynamic { + struct DRWCallDynamic *next, *prev; const void *data[]; -} DRWDynamicCall; +} DRWCallDynamic; struct DRWShadingGroup { struct DRWShadingGroup *next, *prev; GPUShader *shader; /* Shader to bind */ DRWInterface *interface; /* Uniforms pointers */ - ListBase calls; /* DRWCall or DRWDynamicCall depending of type*/ + ListBase calls; /* DRWCall or DRWCallDynamic depending of type */ DRWState state; /* State changes for this batch only */ int type; @@ -588,13 +588,13 @@ void DRW_shgroup_call_add(DRWShadingGroup *shgroup, Batch *geom, float (*obmat)[ BLI_addtail(&shgroup->calls, call); } -void DRW_shgroup_dynamic_call_add_array(DRWShadingGroup *shgroup, const void *attr[], unsigned int attr_len) +void DRW_shgroup_call_dynamic_add_array(DRWShadingGroup *shgroup, const void *attr[], unsigned int attr_len) { DRWInterface *interface = shgroup->interface; unsigned int data_size = sizeof(void *) * interface->attribs_count; int size = sizeof(ListBase) + data_size; - DRWDynamicCall *call = MEM_callocN(size, "DRWDynamicCall"); + DRWCallDynamic *call = MEM_callocN(size, "DRWCallDynamic"); BLI_assert(attr_len == interface->attribs_count); @@ -684,7 +684,7 @@ void DRW_shgroup_uniform_mat4(DRWShadingGroup *shgroup, const char *name, const #ifdef WITH_CLAY_ENGINE -/* Creates a VBO containing OGL primitives for all DRWDynamicCall */ +/* Creates a VBO containing OGL primitives for all DRWCallDynamic */ static void shgroup_dynamic_batch(DRWShadingGroup *shgroup) { DRWInterface *interface = shgroup->interface; @@ -715,7 +715,7 @@ static void shgroup_dynamic_batch(DRWShadingGroup *shgroup) VertexBuffer_allocate_data(vbo, nbr); int j = 0; - for (DRWDynamicCall *call = shgroup->calls.first; call; call = call->next, j++) { + for (DRWCallDynamic *call = shgroup->calls.first; call; call = call->next, j++) { int i = 0; for (DRWAttrib *attrib = interface->attribs.first; attrib; attrib = attrib->next, i++) { VertexBuffer_set_attrib(vbo, attrib->format_id, j, call->data[i]); @@ -759,7 +759,7 @@ static void shgroup_dynamic_instance(DRWShadingGroup *shgroup) buffer_size = sizeof(float) * interface->attribs_stride * vert_nbr; float *data = MEM_mallocN(buffer_size, "Instance VBO data"); - for (DRWDynamicCall *call = shgroup->calls.first; call; call = call->next) { + for (DRWCallDynamic *call = shgroup->calls.first; call; call = call->next) { for (int j = 0; j < interface->attribs_count; ++j) { memcpy(data + offset, call->data[j], sizeof(float) * interface->attribs_size[j]); offset += interface->attribs_size[j]; diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 739bbe50439..ccf90d21ea5 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -824,29 +824,29 @@ static void DRW_shgroup_lamp(OBJECT_StorageList *stl, Object *ob, SceneLayer *sl /* Don't draw the center if it's selected or active */ if (theme_id == TH_GROUP) - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_center_group, ob->obmat[3]); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_center_group, ob->obmat[3]); else if (theme_id == TH_LAMP) - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_center, ob->obmat[3]); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_center, ob->obmat[3]); /* First circle */ - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_circle, ob->obmat[3], color); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_circle, ob->obmat[3], color); /* draw dashed outer circle if shadow is on. remember some lamps can't have certain shadows! */ if (la->type != LA_HEMI) { if ((la->mode & LA_SHAD_RAY) || ((la->mode & LA_SHAD_BUF) && (la->type == LA_SPOT))) { - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_circle_shadow, ob->obmat[3], color); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_circle_shadow, ob->obmat[3], color); } } /* Distance */ if (ELEM(la->type, LA_HEMI, LA_SUN, LA_AREA)) { - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_distance, color, &zero, &la->dist, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_distance, color, &zero, &la->dist, ob->obmat); } copy_m4_m4(shapemat, ob->obmat); if (la->type == LA_SUN) { - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_sunrays, ob->obmat[3], color); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_sunrays, ob->obmat[3], color); } else if (la->type == LA_SPOT) { float size[3], sizemat[4][4]; @@ -866,32 +866,32 @@ static void DRW_shgroup_lamp(OBJECT_StorageList *stl, Object *ob, SceneLayer *sl mul_m4_m4m4(spotblendmat, shapemat, sizemat); if (la->mode & LA_SQUARE) { - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_spot_pyramid, color, &one, shapemat); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_spot_pyramid, color, &one, shapemat); /* hide line if it is zero size or overlaps with outer border, * previously it adjusted to always to show it but that seems * confusing because it doesn't show the actual blend size */ if (blend != 0.0f && blend != 1.0f) { - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_spot_blend_rect, color, &one, spotblendmat); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_spot_blend_rect, color, &one, spotblendmat); } } else { - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_spot_cone, color, shapemat); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_spot_cone, color, shapemat); /* hide line if it is zero size or overlaps with outer border, * previously it adjusted to always to show it but that seems * confusing because it doesn't show the actual blend size */ if (blend != 0.0f && blend != 1.0f) { - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_spot_blend, color, &one, spotblendmat); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_spot_blend, color, &one, spotblendmat); } } - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_buflimit, color, &la->clipsta, &la->clipend, ob->obmat); - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_buflimit_points, color, &la->clipsta, &la->clipend, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_buflimit, color, &la->clipsta, &la->clipend, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_buflimit_points, color, &la->clipsta, &la->clipend, ob->obmat); } else if (la->type == LA_HEMI) { static float hemisize = 2.0f; - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_hemi, color, &hemisize, shapemat); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_hemi, color, &hemisize, shapemat); } else if (la->type == LA_AREA) { float size[3] = {1.0f, 1.0f, 1.0f}, sizemat[4][4]; @@ -902,12 +902,12 @@ static void DRW_shgroup_lamp(OBJECT_StorageList *stl, Object *ob, SceneLayer *sl mul_m4_m4m4(shapemat, shapemat, sizemat); } - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_area, color, &la->area_size, shapemat); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_area, color, &la->area_size, shapemat); } /* Line and point going to the ground */ - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_groundline, ob->obmat[3]); - DRW_shgroup_dynamic_call_add(stl->g_data->lamp_groundpoint, ob->obmat[3]); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_groundline, ob->obmat[3]); + DRW_shgroup_call_dynamic_add(stl->g_data->lamp_groundpoint, ob->obmat[3]); } static void DRW_shgroup_camera(OBJECT_StorageList *stl, Object *ob, SceneLayer *sl) @@ -945,11 +945,11 @@ static void DRW_shgroup_camera(OBJECT_StorageList *stl, Object *ob, SceneLayer * cam->drwtria[1][0] = shift[0]; cam->drwtria[1][1] = shift[1] + ((1.1f * drawsize * (asp[1] + 0.7f)) * scale[1]); - DRW_shgroup_dynamic_call_add(stl->g_data->camera, color, cam->drwcorners, &cam->drwdepth, cam->drwtria, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->camera, color, cam->drwcorners, &cam->drwdepth, cam->drwtria, ob->obmat); /* Active cam */ if (is_active) { - DRW_shgroup_dynamic_call_add( + DRW_shgroup_call_dynamic_add( stl->g_data->camera_tria, color, cam->drwcorners, &cam->drwdepth, cam->drwtria, ob->obmat); } @@ -968,14 +968,14 @@ static void DRW_shgroup_camera(OBJECT_StorageList *stl, Object *ob, SceneLayer * size_to_mat4(sizemat, size); mul_m4_m4m4(cam->drwfocusmat, cam->drwfocusmat, sizemat); - DRW_shgroup_dynamic_call_add( + DRW_shgroup_call_dynamic_add( stl->g_data->camera_focus, (is_active ? col_hi : col), &cam->drawsize, cam->drwfocusmat); - DRW_shgroup_dynamic_call_add( + DRW_shgroup_call_dynamic_add( stl->g_data->camera_clip, color, &cam->clipsta, &cam->clipend, cam->drwnormalmat); - DRW_shgroup_dynamic_call_add( + DRW_shgroup_call_dynamic_add( stl->g_data->camera_clip_points, (is_active ? col_hi : col), &cam->clipsta, &cam->clipend, cam->drwnormalmat); } @@ -986,10 +986,10 @@ static void DRW_shgroup_camera(OBJECT_StorageList *stl, Object *ob, SceneLayer * if (world) { static float col[3] = {0.5f, 0.5f, 0.5f}, col_hi[3] = {1.0f, 1.0f, 1.0f}; world->mistend = world->miststa + world->mistdist; - DRW_shgroup_dynamic_call_add( + DRW_shgroup_call_dynamic_add( stl->g_data->camera_mist, color, &world->miststa, &world->mistend, cam->drwnormalmat); - DRW_shgroup_dynamic_call_add( + DRW_shgroup_call_dynamic_add( stl->g_data->camera_mist_points, (is_active ? col_hi : col), &world->miststa, &world->mistend, cam->drwnormalmat); } @@ -1003,27 +1003,27 @@ static void DRW_shgroup_empty(OBJECT_StorageList *stl, Object *ob, SceneLayer *s switch (ob->empty_drawtype) { case OB_PLAINAXES: - DRW_shgroup_dynamic_call_add(stl->g_data->plain_axes, color, &ob->empty_drawsize, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->plain_axes, color, &ob->empty_drawsize, ob->obmat); break; case OB_SINGLE_ARROW: - DRW_shgroup_dynamic_call_add(stl->g_data->single_arrow, color, &ob->empty_drawsize, ob->obmat); - DRW_shgroup_dynamic_call_add(stl->g_data->single_arrow_line, color, &ob->empty_drawsize, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->single_arrow, color, &ob->empty_drawsize, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->single_arrow_line, color, &ob->empty_drawsize, ob->obmat); break; case OB_CUBE: - DRW_shgroup_dynamic_call_add(stl->g_data->cube, color, &ob->empty_drawsize, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->cube, color, &ob->empty_drawsize, ob->obmat); break; case OB_CIRCLE: - DRW_shgroup_dynamic_call_add(stl->g_data->circle, color, &ob->empty_drawsize, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->circle, color, &ob->empty_drawsize, ob->obmat); break; case OB_EMPTY_SPHERE: - DRW_shgroup_dynamic_call_add(stl->g_data->sphere, color, &ob->empty_drawsize, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->sphere, color, &ob->empty_drawsize, ob->obmat); break; case OB_EMPTY_CONE: - DRW_shgroup_dynamic_call_add(stl->g_data->cone, color, &ob->empty_drawsize, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->cone, color, &ob->empty_drawsize, ob->obmat); break; case OB_ARROWS: - DRW_shgroup_dynamic_call_add(stl->g_data->arrows, color, &ob->empty_drawsize, ob->obmat); - DRW_shgroup_dynamic_call_add(stl->g_data->axis_names, color, &ob->empty_drawsize, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->arrows, color, &ob->empty_drawsize, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->axis_names, color, &ob->empty_drawsize, ob->obmat); break; } } @@ -1081,18 +1081,18 @@ static void DRW_shgroup_forcefield(OBJECT_StorageList *stl, Object *ob, SceneLay switch (pd->forcefield) { case PFIELD_WIND: - DRW_shgroup_dynamic_call_add(stl->g_data->field_wind, color, &pd->drawvec1, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->field_wind, color, &pd->drawvec1, ob->obmat); break; case PFIELD_FORCE: - DRW_shgroup_dynamic_call_add(stl->g_data->field_force, color, &pd->drawvec1, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->field_force, color, &pd->drawvec1, ob->obmat); break; case PFIELD_VORTEX: - DRW_shgroup_dynamic_call_add(stl->g_data->field_vortex, color, &pd->drawvec1, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->field_vortex, color, &pd->drawvec1, ob->obmat); break; case PFIELD_GUIDE: if (cu && (cu->flag & CU_PATH) && ob->curve_cache->path && ob->curve_cache->path->data) { - DRW_shgroup_dynamic_call_add(stl->g_data->field_curve_sta, color, &pd->f_strength, ob->obmat); - DRW_shgroup_dynamic_call_add(stl->g_data->field_curve_end, color, &pd->f_strength, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->field_curve_sta, color, &pd->f_strength, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->field_curve_end, color, &pd->f_strength, ob->obmat); } break; } @@ -1100,29 +1100,29 @@ static void DRW_shgroup_forcefield(OBJECT_StorageList *stl, Object *ob, SceneLay if (pd->falloff == PFIELD_FALL_SPHERE) { /* as last, guide curve alters it */ if ((pd->flag & PFIELD_USEMAX) != 0) { - DRW_shgroup_dynamic_call_add(stl->g_data->field_curve_end, color, &pd->maxdist, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->field_curve_end, color, &pd->maxdist, ob->obmat); } if ((pd->flag & PFIELD_USEMIN) != 0) { - DRW_shgroup_dynamic_call_add(stl->g_data->field_curve_end, color, &pd->mindist, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->field_curve_end, color, &pd->mindist, ob->obmat); } } else if (pd->falloff == PFIELD_FALL_TUBE) { if (pd->flag & (PFIELD_USEMAX | PFIELD_USEMAXR)) { - DRW_shgroup_dynamic_call_add(stl->g_data->field_tube_limit, color, &pd->drawvec_falloff_max, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->field_tube_limit, color, &pd->drawvec_falloff_max, ob->obmat); } if (pd->flag & (PFIELD_USEMIN | PFIELD_USEMINR)) { - DRW_shgroup_dynamic_call_add(stl->g_data->field_tube_limit, color, &pd->drawvec_falloff_min, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->field_tube_limit, color, &pd->drawvec_falloff_min, ob->obmat); } } else if (pd->falloff == PFIELD_FALL_CONE) { if (pd->flag & (PFIELD_USEMAX | PFIELD_USEMAXR)) { - DRW_shgroup_dynamic_call_add(stl->g_data->field_cone_limit, color, &pd->drawvec_falloff_max, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->field_cone_limit, color, &pd->drawvec_falloff_max, ob->obmat); } if (pd->flag & (PFIELD_USEMIN | PFIELD_USEMINR)) { - DRW_shgroup_dynamic_call_add(stl->g_data->field_cone_limit, color, &pd->drawvec_falloff_min, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->field_cone_limit, color, &pd->drawvec_falloff_min, ob->obmat); } } } @@ -1133,14 +1133,14 @@ static void DRW_shgroup_speaker(OBJECT_StorageList *stl, Object *ob, SceneLayer static float one = 1.0f; DRW_object_wire_theme_get(ob, sl, &color); - DRW_shgroup_dynamic_call_add(stl->g_data->speaker, color, &one, ob->obmat); + DRW_shgroup_call_dynamic_add(stl->g_data->speaker, color, &one, ob->obmat); } static void DRW_shgroup_relationship_lines(OBJECT_StorageList *stl, Object *ob) { if (ob->parent) { - DRW_shgroup_dynamic_call_add(stl->g_data->relationship_lines, ob->obmat[3]); - DRW_shgroup_dynamic_call_add(stl->g_data->relationship_lines, ob->parent->obmat[3]); + DRW_shgroup_call_dynamic_add(stl->g_data->relationship_lines, ob->obmat[3]); + DRW_shgroup_call_dynamic_add(stl->g_data->relationship_lines, ob->parent->obmat[3]); } } @@ -1166,7 +1166,7 @@ static void DRW_shgroup_object_center(OBJECT_StorageList *stl, Object *ob) } } - DRW_shgroup_dynamic_call_add(shgroup, ob->obmat[3]); + DRW_shgroup_call_dynamic_add(shgroup, ob->obmat[3]); } static void OBJECT_cache_populate(void *vedata, Object *ob) |