diff options
| author | Sergey Sharybin <sergey@blender.org> | 2022-02-09 18:15:56 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2022-02-09 18:16:21 +0300 |
| commit | c69ee218d786e6ae24804b00e7a7856c7638f7b0 (patch) | |
| tree | 5c35fcc7114bf1d7c0f99a9740559d352baf3f6c /intern/cycles/util/math.h | |
| parent | 7313a84c5acb401817f1c44cfd8bf22428f34424 (diff) | |
Revert "Fix size_t -> int -> size_t round trip in Cycles"
This reverts commit d74bb7be1916744ae56347b49333eac22ebb7339.
Need to re-iterate to have a proper support of all platforms.
Diffstat (limited to 'intern/cycles/util/math.h')
| -rw-r--r-- | intern/cycles/util/math.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/intern/cycles/util/math.h b/intern/cycles/util/math.h index a580a21c28b..605a19aaef0 100644 --- a/intern/cycles/util/math.h +++ b/intern/cycles/util/math.h @@ -124,12 +124,7 @@ ccl_device_inline int min(int a, int b) return (a < b) ? a : b; } -ccl_device_inline uint32_t min(uint32_t a, uint32_t b) -{ - return (a < b) ? a : b; -} - -ccl_device_inline uint64_t min(uint64_t a, uint64_t b) +ccl_device_inline uint min(uint a, uint b) { return (a < b) ? a : b; } |