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:
authorLuca Rood <dev@lucarood.com>2017-04-21 15:28:23 +0300
committerLuca Rood <dev@lucarood.com>2017-04-24 17:09:04 +0300
commit913e9350a56dc384d76a4b1cce36300764c35011 (patch)
treed9639d9f1334314f2f50e3a3747f841a06a3b093 /source/blender/editors/space_view3d/drawmesh.c
parent2010dbe8a59e80775219fb5162f3c2f5dfd24e04 (diff)
Convert BaseLegacy to Base (part)
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
-rw-r--r--source/blender/editors/space_view3d/drawmesh.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index f1deae7e0fd..1162a7ac36d 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -403,7 +403,7 @@ static bool set_draw_settings_cached(
return c_badtex;
}
-static void draw_textured_begin(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob)
+static void draw_textured_begin(Scene *scene, SceneLayer *sl, View3D *v3d, RegionView3D *rv3d, Object *ob)
{
unsigned char obcol[4];
bool is_tex, solidtex;
@@ -439,9 +439,7 @@ static void draw_textured_begin(Scene *scene, View3D *v3d, RegionView3D *rv3d, O
Gtexdraw.is_lit = 0;
}
else {
- Gtexdraw.is_lit = GPU_scene_object_lights(
- scene, ob, v3d->localvd ? v3d->localvd->lay : v3d->lay,
- rv3d->viewmat, !rv3d->is_persp);
+ Gtexdraw.is_lit = GPU_scene_object_lights(sl, rv3d->viewmat, !rv3d->is_persp);
}
}
@@ -957,7 +955,7 @@ static void draw_mesh_textured_old(Scene *scene, SceneLayer *sl, View3D *v3d, Re
else glFrontFace(GL_CCW);
/* draw the textured mesh */
- draw_textured_begin(scene, v3d, rv3d, ob);
+ draw_textured_begin(scene, sl, v3d, rv3d, ob);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);