diff options
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/intern/draw_manager_shader.c | 6 | ||||
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c index a0c8cd4195a..06a579c2208 100644 --- a/source/blender/draw/intern/draw_manager_shader.c +++ b/source/blender/draw/intern/draw_manager_shader.c @@ -352,8 +352,7 @@ GPUMaterial *DRW_shader_create_from_world( if (mat == NULL) { mat = GPU_material_from_nodetree( - scene, wo->nodetree, &wo->gpumaterial, engine_type, options, - vert, geom, frag_lib, defines, true); + scene, wo->nodetree, &wo->gpumaterial, engine_type, options); } drw_deferred_shader_add(mat, vert, geom, frag_lib, defines); @@ -372,8 +371,7 @@ GPUMaterial *DRW_shader_create_from_material( if (mat == NULL) { mat = GPU_material_from_nodetree( - scene, ma->nodetree, &ma->gpumaterial, engine_type, options, - vert, geom, frag_lib, defines, true); + scene, ma->nodetree, &ma->gpumaterial, engine_type, options); } drw_deferred_shader_add(mat, vert, geom, frag_lib, defines); diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index b7d20fd48d1..d7419dd4717 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -1367,11 +1367,9 @@ static void DRW_shgroup_lamp(OBJECT_StorageList *stl, Object *ob, ViewLayer *vie /* First circle */ 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! */ + /* draw dashed outer circle for shadow */ if (la->type != LA_HEMI) { - if ((la->mode & LA_SHAD_RAY) || ((la->mode & LA_SHAD_BUF) && (la->type == LA_SPOT))) { - DRW_shgroup_call_dynamic_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 */ |