diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2014-07-28 21:29:03 +0400 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2014-07-31 07:35:17 +0400 |
commit | 5c3c3abb454c7a11709abee5e3648aa23f82408c (patch) | |
tree | 451c9d53e88faa05fdea74f7e521ec8d3b7901f2 /intern/cycles/render/bake.h | |
parent | 9952699978a132e4866acd26817fb9cfec23419d (diff) |
Cycles Bake: use size_t instead of width, height
(original patch by Sergey Sharybin)
Note: RNA API can't use size_t at the moment. Once it does this patch
can be tweaked a bit to fully benefit from size_t larger dimensions.
(right now num_pixels is passed as int)
Reviewed By: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D688
Diffstat (limited to 'intern/cycles/render/bake.h')
-rw-r--r-- | intern/cycles/render/bake.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/render/bake.h b/intern/cycles/render/bake.h index bf03a164f8e..652420c2e19 100644 --- a/intern/cycles/render/bake.h +++ b/intern/cycles/render/bake.h @@ -27,20 +27,20 @@ CCL_NAMESPACE_BEGIN class BakeData { public: - BakeData(const int object, const int tri_offset, const int num_pixels); + BakeData(const int object, const size_t tri_offset, const size_t num_pixels); ~BakeData(); void set(int i, int prim, float uv[2], float dudx, float dudy, float dvdx, float dvdy); int object(); - int size(); + size_t size(); uint4 data(int i); uint4 differentials(int i); bool is_valid(int i); private: int m_object; - int m_tri_offset; - int m_num_pixels; + size_t m_tri_offset; + size_t m_num_pixels; vector<int>m_primitive; vector<float>m_u; vector<float>m_v; @@ -58,7 +58,7 @@ public: bool get_baking(); void set_baking(const bool value); - BakeData *init(const int object, const int tri_offset, const int num_pixels); + BakeData *init(const int object, const size_t tri_offset, const size_t num_pixels); bool bake(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress, ShaderEvalType shader_type, BakeData *bake_data, float result[]); |