From 6e4fccd9fae37c20bc3b8ff52aeb5bf1328c56ad Mon Sep 17 00:00:00 2001 From: Evan Wilson Date: Fri, 11 Dec 2020 08:44:52 +0100 Subject: Correct the order of the last two arguments in `eevee_cryptomatte_shading_group_create` When compiling on Windows, the following warnings occur: ```[3468/4560] Building C object source\blender\draw\CMakeFiles\bf_draw.dir\engines\eevee\eevee_cryptomatte.c.obj C:\blender-git\blender\source\blender\draw\engines\eevee\eevee_cryptomatte.c(306): warning C4047: 'function': 'bool' differs in levels of indirection from 'void *' C:\blender-git\blender\source\blender\draw\engines\eevee\eevee_cryptomatte.c(306): warning C4024: 'eevee_cryptomatte_shading_group_create': different types for formal and actual parameter 5``` As @Severin pointed out [here](https://developer.blender.org/rB76a0b322e4d3244e59a154c8255b84a4fbc33117#288960), this is due to the last two arguments being flipped. This diff corrects the order. Reviewed By: Severin, fclem Differential Revision: https://developer.blender.org/D9809 --- release/scripts/addons | 2 +- release/scripts/addons_contrib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'release') diff --git a/release/scripts/addons b/release/scripts/addons index 1191a172ac3..1a3f127714e 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 1191a172ac389e3d068a8ef7d16f36457e67e3bc +Subproject commit 1a3f127714e8da9f0af12d9a174dae9793ae63c1 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index eae381b6982..d71985e9019 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit eae381b698248e70e4a3c62bdf239f9d5a0470a9 +Subproject commit d71985e901986970dfc86c3d5d1124d0f8c27518 -- cgit v1.2.3