From ba67d9425865fc60836dc003e8bfaff651dc57d9 Mon Sep 17 00:00:00 2001 From: Andrea Weikert Date: Sun, 1 Oct 2017 15:02:52 +0200 Subject: [PATCH] Compile fixes for MSVC: * missing include for uint typedef * macro syntax error Reviewers: campbellbarton, fclem Reviewed By: fclem Differential Revision: https://developer.blender.org/D2863 --- source/blender/blenlib/BLI_memiter.h | 1 + source/blender/draw/modes/object_mode.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/blenlib/BLI_memiter.h b/source/blender/blenlib/BLI_memiter.h index 36877d8f4ba..b16f1ae8c43 100644 --- a/source/blender/blenlib/BLI_memiter.h +++ b/source/blender/blenlib/BLI_memiter.h @@ -30,6 +30,7 @@ extern "C" { #endif +#include "BLI_sys_types.h" #include "BLI_compiler_attrs.h" #include "BLI_compiler_compat.h" diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 46153ede354..de09d21234b 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -1483,7 +1483,7 @@ static void DRW_shgroup_lightprobe(OBJECT_StorageList *stl, OBJECT_PassList *psl DRWShadingGroup *grp = DRW_shgroup_instance_create(e_data.lightprobe_grid_sh, psl->lightprobes, DRW_cache_sphere_get()); /* Dummy call just to save select ID */ - DRW_shgroup_call_dynamic_add(grp); + DRW_shgroup_call_dynamic_add_empty(grp); /* Then overide the instance count */ DRW_shgroup_set_instance_count(grp, prb->grid_resolution_x * prb->grid_resolution_y * prb->grid_resolution_z); DRW_shgroup_uniform_vec4(grp, "color", color, 1);