ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct the order of the last two arguments in eevee_cryptomatte_shading_group_create

Browse source 
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
This commit is contained in:
Evan Wilson 2020-12-11 08:44:52 +01:00 • committed by Jeroen Bakker
parent 219dba8506
commit 6e4fccd9fa
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
release/scripts/addons

@ -1 +1 @@
Subproject commit 1191a172ac389e3d068a8ef7d16f36457e67e3bc
Subproject commit 1a3f127714e8da9f0af12d9a174dae9793ae63c1

2
release/scripts/addons_contrib

@ -1 +1 @@
Subproject commit eae381b698248e70e4a3c62bdf239f9d5a0470a9
Subproject commit d71985e901986970dfc86c3d5d1124d0f8c27518

2
source/blender/draw/engines/eevee/eevee_cryptomatte.c
View file

@ -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);
}
}