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:
Diffstat (limited to 'source/blender/draw/modes/object_mode.c')
-rw-r--r--source/blender/draw/modes/object_mode.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index ea36b03284b..b8964e2682b 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -244,7 +244,6 @@ typedef struct OBJECT_PrivateData {
/* Hair Systems */
DRWShadingGroup *hair_verts;
- DRWShadingGroup *hair_edges;
/* Outlines id offset */
int id_ofs_active;
@@ -1346,10 +1345,6 @@ static void OBJECT_cache_init(void *vedata)
DRW_shgroup_uniform_vec4(stl->g_data->hair_verts, "color", ts.colorVertex, 1);
DRW_shgroup_uniform_float(stl->g_data->hair_verts, "size", &ts.sizeVertex, 1);
DRW_shgroup_state_enable(stl->g_data->hair_verts, DRW_STATE_POINT);
-
- GPUShader *sh_edges = GPU_shader_get_builtin_shader(GPU_SHADER_3D_UNIFORM_COLOR);
- stl->g_data->hair_edges = DRW_shgroup_create(sh_edges, psl->hair);
- DRW_shgroup_uniform_vec4(stl->g_data->hair_edges, "color", ts.colorWire, 1);
}
{
@@ -2353,27 +2348,6 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
break;
}
- {
- struct Mesh *scalp = ob->data;
- if (scalp)
- {
- for (ModifierData *md = ob->modifiers.first; md; md = md->next)
- {
- if (md->type == eModifierType_Hair)
- {
- HairModifierData *hmd = (HairModifierData*)md;
-
- if (!modifier_isEnabled(draw_ctx->scene, md, eModifierMode_Realtime))
- {
- continue;
- }
-
- DRW_shgroup_hair(ob, hmd->hair_system, hmd->draw_settings, scalp, stl->g_data->hair_verts, stl->g_data->hair_edges);
- }
- }
- }
- }
-
if (ob->pd && ob->pd->forcefield) {
DRW_shgroup_forcefield(stl, ob, view_layer);
}