[Bf-blender-cvs] [7e535499d5f] master: Clean-up: Fix build warning with MSVC

Ray Molenkamp noreply at git.blender.org
Thu Dec 17 05:03:50 CET 2020


Commit: 7e535499d5f691876a50aede97e52cbb07c3b636
Author: Ray Molenkamp
Date:   Wed Dec 16 21:03:42 2020 -0700
Branches: master
https://developer.blender.org/rB7e535499d5f691876a50aede97e52cbb07c3b636

Clean-up: Fix build warning with MSVC

Callback function was using int while update_render_passes_cb_t was
using eNodeSocketDatatype leading to a build warning about different
argument types with MSVC.

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

M	source/blender/blenkernel/intern/layer.c

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

diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 8a699e31f37..fbad0d920ed 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -2054,7 +2054,7 @@ static void bke_view_layer_verify_aov_cb(void *userdata,
                                          const char *name,
                                          int UNUSED(channels),
                                          const char *UNUSED(chanid),
-                                         int UNUSED(type))
+                                         eNodeSocketDatatype UNUSED(type))
 {
   GHash *name_count = userdata;
   void **value_p;



More information about the Bf-blender-cvs mailing list