[Bf-blender-cvs] [528cb8877f3] blender2.8: Building 2.8 again after warning cleanup (696ed6d3ca)
Dalai Felinto
noreply at git.blender.org
Thu Mar 9 12:08:54 CET 2017
Commit: 528cb8877f3c8923752a016854682722708c47a0
Author: Dalai Felinto
Date: Thu Mar 9 12:08:44 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB528cb8877f3c8923752a016854682722708c47a0
Building 2.8 again after warning cleanup (696ed6d3ca)
===================================================================
M source/blender/gpu/intern/gpu_draw.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index d7b1d5b16ef..3d75acb12f5 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, SceneLayer *UNUSED(sl), Object *ob,
+ View3D *v3d, RegionView3D *rv3d, Scene *scene, SceneLayer *sl, Object *ob,
bool glsl, bool *do_alpha_after)
{
Material *ma;
@@ -1728,6 +1728,8 @@ void GPU_begin_object_materials(
if (rv3d->rflag & RV3D_IS_GAME_ENGINE) {
ob = BKE_object_lod_matob_get(ob, sl);
}
+#else
+ UNUSED_VARS(sl);
#endif
/* initialize state */
More information about the Bf-blender-cvs
mailing list