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>2014-05-08 00:26:24 +0400
committerDalai Felinto <dfelinto@gmail.com>2014-05-08 21:38:43 +0400
commit672cebf19a8b7fe8f9ac0f732fd6e8a0df239c7f (patch)
treee83cb1f1a1f5bf80dbf2a6fe46e549f873863022 /intern/cycles/render/bake.h
parent31cb7e395e656e4a1590e1c9c4531e8a4b4f32ea (diff)
Cycles-Bake: displacement support (fix T40068)
Code with contribution from Brecht Van Lommel. Reviewers: brecht Differential Revision: https://developer.blender.org/D510
Diffstat (limited to 'intern/cycles/render/bake.h')
-rw-r--r--intern/cycles/render/bake.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/render/bake.h b/intern/cycles/render/bake.h
index 830a9513065..ea403f7d39a 100644
--- a/intern/cycles/render/bake.h
+++ b/intern/cycles/render/bake.h
@@ -29,10 +29,11 @@ public:
BakeData(const int object, const int tri_offset, const int num_pixels);
~BakeData();
- void set(int i, int prim, float uv[2]);
+ void set(int i, int prim, float uv[2], float dudx, float dudy, float dvdx, float dvdy);
int object();
int size();
uint4 data(int i);
+ uint4 differentials(int i);
bool is_valid(int i);
private:
@@ -42,6 +43,10 @@ private:
vector<int>m_primitive;
vector<float>m_u;
vector<float>m_v;
+ vector<float>m_dudx;
+ vector<float>m_dudy;
+ vector<float>m_dvdx;
+ vector<float>m_dvdy;
};
class BakeManager {