Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-05-03 22:16:45 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-05-03 22:16:45 +0300
commitc171f0b3c96cb2d01fd6b6919f4dbec1a81c8da9 (patch)
tree0f9fa284e17d195481744026b701bc53b78a4411
parent6abcd6cfd545ecd3cb61b4ece065b10890779cd6 (diff)
Fix Cycles build on Windows
-rw-r--r--intern/cycles/util/util_types.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index aacf7c1bd8e..feab7996aee 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -94,6 +94,7 @@ CCL_NAMESPACE_BEGIN
#ifndef __KERNEL_OPENCL__
typedef unsigned char uchar;
typedef unsigned int uint;
+typedef unsigned short ushort;
#endif
/* Fixed Bits Types */