diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-31 13:51:46 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-31 13:51:46 +0400 |
commit | 6a128eee7b8a49e5d7344f8982c82fc2aa97dad6 (patch) | |
tree | 2a385fd94761b66777db1ba0675151e84b697c2e /source/blender/makesrna/intern/rna_render.c | |
parent | 89983a2187863b9fbd72f5b1b45aadf2c930aba3 (diff) | |
parent | b434550edcae656a50ac46a45ae66641b8fd0050 (diff) |
Cycles: svn merge -r36777:37040 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Diffstat (limited to 'source/blender/makesrna/intern/rna_render.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_render.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index fc5fb021d8e..20ae9cae5f6 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -160,7 +160,7 @@ static void engine_view_draw(RenderEngine *engine, const struct bContext *contex /* RenderEngine registration */ -static void rna_RenderEngine_unregister(Main *bmain, StructRNA *type) +static void rna_RenderEngine_unregister(Main *UNUSED(bmain), StructRNA *type) { RenderEngineType *et= RNA_struct_blender_type_get(type); |