[Bf-blender-cvs] [6e4fccd9fae] master: Correct the order of the last two arguments in `eevee_cryptomatte_shading_group_create`

[Evan Wilson]

Commit: 6e4fccd9fae37c20bc3b8ff52aeb5bf1328c56ad
Author: Evan Wilson
Date:   Fri Dec 11 08:44:52 2020 +0100
Branches: master
https://developer.blender.org/rB6e4fccd9fae37c20bc3b8ff52aeb5bf1328c56ad

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

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

M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/draw/engines/eevee/eevee_cryptomatte.c

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

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
diff --git a/source/blender/draw/engines/eevee/eevee_cryptomatte.c b/source/blender/draw/engines/eevee/eevee_cryptomatte.c
index 44ff86b3333..95f5aa8b628 100644
--- a/source/blender/draw/engines/eevee/eevee_cryptomatte.c
+++ b/source/blender/draw/engines/eevee/eevee_cryptomatte.c
@@ -303,7 +303,7 @@ void EEVEE_cryptomatte_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *s
     GPUBatch *geom = DRW_cache_object_surface_get(ob);
     if (geom) {
       DRWShadingGroup *grp = eevee_cryptomatte_shading_group_create(
-          vedata, sldata, ob, false, NULL);
+          vedata, sldata, ob, NULL, false);
       DRW_shgroup_call(grp, geom, ob);
     }
   }