Cycles: Use size_t for aligned allocator

Seems it got changes by accident to int during guarded allocation work,
causing bad memory allocations.

2 files changed, 4 insertions, 2 deletions

diff --git a/intern/cycles/util/util_aligned_malloc.cpp b/intern/cycles/util/util_aligned_malloc.cpp
index 3e825ce2e0f..9ff857e3543 100644
--- a/intern/cycles/util/util_aligned_malloc.cpp
+++ b/intern/cycles/util/util_aligned_malloc.cpp
@@ -40,7 +40,7 @@
 
 CCL_NAMESPACE_BEGIN
 
-void *util_aligned_malloc(int size, int alignment)
+void *util_aligned_malloc(size_t size, int alignment)
 {
 #ifdef WITH_BLENDER_GUARDEDALLOC
 	return MEM_mallocN_aligned(size, alignment, "Cycles Aligned Alloc");
diff --git a/intern/cycles/util/util_aligned_malloc.h b/intern/cycles/util/util_aligned_malloc.h
index 28c240a20e7..ecc0f28c376 100644
--- a/intern/cycles/util/util_aligned_malloc.h
+++ b/intern/cycles/util/util_aligned_malloc.h
@@ -17,10 +17,12 @@
 #ifndef __UTIL_ALIGNED_MALLOC_H__
 #define __UTIL_ALIGNED_MALLOC_H__
 
+#include "util_types.h"
+
 CCL_NAMESPACE_BEGIN
 
 /* Allocate block of size bytes at least aligned to a given value. */
-void *util_aligned_malloc(int size, int alignment);
+void *util_aligned_malloc(size_t size, int alignment);
 
 /* Free memory allocated by util_aligned_malloc. */
 void util_aligned_free(void *ptr);