diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 08:18:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 08:18:28 +0400 |
| commit | 0503a4f7a6fa2aba573ff4f8d4c6d7f387894952 (patch) | |
| tree | 26fa3836cd19536e6445ef4aad8fcecece1614f3 /source/blender/blenkernel/intern/smoke.c | |
| parent | 618d4d1a6e4a3df8399549fa80846cdeacb7299c (diff) | |
| parent | 2bd9519e39f7c383005fd531f4c7dd92cce246ad (diff) | |
svn merge ^/trunk/blender -r41100:41150
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 002a4b7ec5a..889db8eb035 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -812,13 +812,12 @@ void smokeModifier_copy(struct SmokeModifierData *smd, struct SmokeModifierData } } +#ifdef WITH_SMOKE // forward decleration static void smoke_calc_transparency(float *result, float *input, float *p0, float *p1, int res[3], float dx, float *light, bresenham_callback cb, float correct); static float calc_voxel_transp(float *result, float *input, int res[3], int *pixel, float *tRay, float correct); -#ifdef WITH_SMOKE - static int get_lamp(Scene *scene, float *light) { Base *base_tmp = NULL; |