diff options
author | Germano <germano.costa@ig.com.br> | 2018-02-16 07:01:09 +0300 |
---|---|---|
committer | Germano <germano.costa@ig.com.br> | 2018-02-16 07:01:09 +0300 |
commit | fa0e89b9e857b8696dbecdfe82aa7adea6d5a947 (patch) | |
tree | d59ec8f951602c84816d5b27cd04a81dd6273b1e /source/blender/draw/intern/draw_common.c | |
parent | 3ba6ff675012db236f18393dc4a3ac185aa93d47 (diff) |
Metalball drawing: rename mball helpers to handles
and also rename some related functions
Diffstat (limited to 'source/blender/draw/intern/draw_common.c')
-rw-r--r-- | source/blender/draw/intern/draw_common.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index 0bf7c24193c..62166092638 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -168,7 +168,7 @@ static struct { struct Gwn_VertFormat *instance_spot; struct Gwn_VertFormat *instance_bone_envelope_wire; struct Gwn_VertFormat *instance_bone_envelope_solid; - struct Gwn_VertFormat *instance_mball_helpers; + struct Gwn_VertFormat *instance_mball_handles; } g_formats = {NULL}; void DRW_globals_free(void) @@ -421,17 +421,17 @@ DRWShadingGroup *shgroup_instance_bone_envelope_solid(DRWPass *pass, struct Gwn_ return grp; } -DRWShadingGroup *shgroup_instance_mball_helpers(DRWPass *pass, struct Gwn_Batch *geom) +DRWShadingGroup *shgroup_instance_mball_handles(DRWPass *pass, struct Gwn_Batch *geom) { - GPUShader *sh = GPU_shader_get_builtin_shader(GPU_SHADER_3D_INSTANCE_MBALL_HELPERS); + GPUShader *sh = GPU_shader_get_builtin_shader(GPU_SHADER_3D_INSTANCE_MBALL_HANDLES); - DRW_shgroup_instance_format(g_formats.instance_mball_helpers, { + DRW_shgroup_instance_format(g_formats.instance_mball_handles, { {"ScaleTranslationMatrix" , DRW_ATTRIB_FLOAT, 16}, {"radius" , DRW_ATTRIB_FLOAT, 1}, {"color" , DRW_ATTRIB_FLOAT, 3} }); - DRWShadingGroup *grp = DRW_shgroup_instance_create(sh, pass, geom, g_formats.instance_mball_helpers); + DRWShadingGroup *grp = DRW_shgroup_instance_create(sh, pass, geom, g_formats.instance_mball_handles); DRW_shgroup_uniform_vec3(grp, "screen_vecs[0]", DRW_viewport_screenvecs_get(), 2); return grp; |