Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGermano <germano.costa@ig.com.br>2018-02-16 07:01:09 +0300
committerGermano <germano.costa@ig.com.br>2018-02-16 07:01:09 +0300
commitfa0e89b9e857b8696dbecdfe82aa7adea6d5a947 (patch)
treed59ec8f951602c84816d5b27cd04a81dd6273b1e /source/blender/draw/modes/object_mode.c
parent3ba6ff675012db236f18393dc4a3ac185aa93d47 (diff)
Metalball drawing: rename mball helpers to handles
and also rename some related functions
Diffstat (limited to 'source/blender/draw/modes/object_mode.c')
-rw-r--r--source/blender/draw/modes/object_mode.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index ec43316240e..4a7a5d25b11 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -156,7 +156,7 @@ typedef struct OBJECT_PrivateData {
DRWShadingGroup *probe_grid;
/* MetaBalls */
- DRWShadingGroup *mball_circle;
+ DRWShadingGroup *mball_handle;
/* Lamps */
DRWShadingGroup *lamp_center;
@@ -980,10 +980,10 @@ static void OBJECT_cache_init(void *vedata)
}
{
- /* Metaballs Helpers */
+ /* Metaballs Handles */
struct Gwn_Batch *geom;
geom = DRW_cache_screenspace_circle_get();
- stl->g_data->mball_circle = shgroup_instance_mball_helpers(psl->non_meshes, geom);
+ stl->g_data->mball_handle = shgroup_instance_mball_handles(psl->non_meshes, geom);
}
{
@@ -1115,7 +1115,7 @@ static void OBJECT_cache_init(void *vedata)
}
}
-static void DRW_shgroup_mball_helpers(OBJECT_StorageList *stl, Object *ob, ViewLayer *view_layer)
+static void DRW_shgroup_mball_handles(OBJECT_StorageList *stl, Object *ob, ViewLayer *view_layer)
{
MetaBall *mb = ob->data;
@@ -1124,8 +1124,8 @@ static void DRW_shgroup_mball_helpers(OBJECT_StorageList *stl, Object *ob, ViewL
for (MetaElem *ml = mb->elems.first; ml != NULL; ml = ml->next) {
/* draw radius */
- BKE_mball_element_calc_display_m3x4(ml->draw_scale_xform, ob->obmat, &ml->x);
- DRW_shgroup_call_dynamic_add(stl->g_data->mball_circle, ml->draw_scale_xform, &ml->rad, color);
+ BKE_mball_element_calc_scale_xform(ml->draw_scale_xform, ob->obmat, &ml->x);
+ DRW_shgroup_call_dynamic_add(stl->g_data->mball_handle, ml->draw_scale_xform, &ml->rad, color);
}
}
@@ -1884,7 +1884,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
case OB_MBALL:
{
if (ob != draw_ctx->object_edit) {
- DRW_shgroup_mball_helpers(stl, ob, view_layer);
+ DRW_shgroup_mball_handles(stl, ob, view_layer);
}
break;
}