diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-03-02 17:52:27 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-03-02 19:09:24 +0300 |
| commit | 209021a7031f830e8fd490f9f9698cfabc8db729 (patch) | |
| tree | 6841a063932d95150bf564e182e7d5ff88e42101 /source/blender/gpu | |
| parent | 083bc48816d0962d593c0a2d28b068dd24a706f8 (diff) | |
Remove all instances of OBACT from drawobject.c and related changes
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/GPU_draw.h | 4 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h index 91d436557f0..47ddabbed19 100644 --- a/source/blender/gpu/GPU_draw.h +++ b/source/blender/gpu/GPU_draw.h @@ -42,6 +42,7 @@ struct ImageUser; struct MTexPoly; struct Object; struct Scene; +struct SceneLayer; struct View3D; struct RegionView3D; struct SmokeModifierData; @@ -74,7 +75,8 @@ void GPU_disable_program_point_size(void); * - after drawing, the material must be disabled again */ void GPU_begin_object_materials(struct View3D *v3d, struct RegionView3D *rv3d, - struct Scene *scene, struct Object *ob, bool glsl, bool *do_alpha_after); + struct Scene *scene, struct SceneLayer *sl, + struct Object *ob, bool glsl, bool *do_alpha_after); void GPU_end_object_materials(void); bool GPU_object_materials_check(void); diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index e8e3d7e11b4..0da52118324 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -1687,7 +1687,7 @@ void GPU_end_dupli_object(void) } void GPU_begin_object_materials( - View3D *v3d, RegionView3D *rv3d, Scene *scene, Object *ob, + View3D *v3d, RegionView3D *rv3d, Scene *scene, SceneLayer *sl, Object *ob, bool glsl, bool *do_alpha_after) { Material *ma; @@ -1726,7 +1726,7 @@ void GPU_begin_object_materials( #ifdef WITH_GAMEENGINE if (rv3d->rflag & RV3D_IS_GAME_ENGINE) { - ob = BKE_object_lod_matob_get(ob, scene); + ob = BKE_object_lod_matob_get(ob, sl); } #endif |