[Bf-blender-cvs] [69c9163bafc] greasepencil-object: Cleanup: Fix merge error

Antonio Vazquez noreply at git.blender.org
Tue Jun 6 11:59:34 CEST 2017


Commit: 69c9163bafc25e59a1837fee4c2fb549d3443ecd
Author: Antonio Vazquez
Date:   Tue Jun 6 11:57:05 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB69c9163bafc25e59a1837fee4c2fb549d3443ecd

Cleanup: Fix merge error

===================================================================

M	source/blender/draw/engines/eevee/eevee_engine.c

===================================================================

diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c
index 95b833d22cc..2a75777c15e 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -109,7 +109,7 @@ static void EEVEE_cache_populate(void *vedata, Object *ob)
 	}
 }
 
-static void EEVEE_cache_finish(void *UNUSED(vedata))
+static void EEVEE_cache_finish(void *vedata)
 {
 	EEVEE_SceneLayerData *sldata = EEVEE_scene_layer_data_get();




More information about the Bf-blender-cvs mailing list