diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-11-07 20:36:49 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-11-07 20:36:49 +0400 |
| commit | edec46b0a6aac18f406991b9e16228d4bd848c61 (patch) | |
| tree | 1240768d737c63705fdb38c9832d926ed0bcda94 /source/blender/render/intern/include | |
| parent | 2ed6f077b3952123d56916980d18a379ecb3e5ac (diff) | |
| parent | 4d7a9e5c055fd3903162b61fdd40fb77b2b96793 (diff) | |
Merge with trunk r41625
Diffstat (limited to 'source/blender/render/intern/include')
| -rw-r--r-- | source/blender/render/intern/include/rendercore.h | 1 | ||||
| -rw-r--r-- | source/blender/render/intern/include/zbuf.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h index 5a544c46255..08f73ccbe0d 100644 --- a/source/blender/render/intern/include/rendercore.h +++ b/source/blender/render/intern/include/rendercore.h @@ -42,7 +42,6 @@ /* vector defines */ #define CROSS(dest, a, b) { dest[0]= a[1] * b[2] - a[2] * b[1]; dest[1]= a[2] * b[0] - a[0] * b[2]; dest[2]= a[0] * b[1] - a[1] * b[0]; } -#define VECMUL(dest, f) { dest[0]*= f; dest[1]*= f; dest[2]*= f; } struct HaloRen; struct ShadeInput; diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h index 6567cdacf0e..c467c31b5a6 100644 --- a/source/blender/render/intern/include/zbuf.h +++ b/source/blender/render/intern/include/zbuf.h @@ -135,7 +135,7 @@ void zbufclipwire(struct ZSpan *zspan, int obi, int zvlnr, int ec, float *ho1, f /* exported to shadeinput.c */ void zbuf_make_winmat(Render *re, float winmat[][4]); -void zbuf_render_project(float winmat[][4], float *co, float *ho); +void zbuf_render_project(float winmat[][4], const float co[3], float ho[4]); #endif |