From 0a37e6ab976344818483df899b4fc44aedb30613 Mon Sep 17 00:00:00 2001 From: Miika Hamalainen Date: Mon, 31 Oct 2011 13:01:06 +0000 Subject: Dynamic Paint: * Redesigned alpha blending and paint drying algorithms. Now it gives much better results when using low brush alpha or when surface has initial color set. * Fix: "Slow" dissolve/dry was scaled incorrect when using substeps. Also adjusted time to better match non-"slow" setting. * Fixed possible issues when using image textured brush. * Fix: particle brush panel was no longer visible since last commit. * Adjusted default surface values. * Some more code cleanup. --- source/blender/render/intern/include/texture.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/render/intern/include') diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h index ac4340f88a6..d7d0a7e086d 100644 --- a/source/blender/render/intern/include/texture.h +++ b/source/blender/render/intern/include/texture.h @@ -65,7 +65,7 @@ struct ImBuf; void do_halo_tex(struct HaloRen *har, float xn, float yn, float col_r[4]); void do_sky_tex(const float rco[3], float lo[3], const float dxyview[2], float hor[3], float zen[3], float *blend, int skyflag, short thread); -void do_material_tex(struct ShadeInput *shi); +void do_material_tex(struct ShadeInput *shi, struct Render *re); void do_lamp_tex(LampRen *la, const float lavec[3], struct ShadeInput *shi, float col_r[3], int effect); void do_volume_tex(struct ShadeInput *shi, const float xyz[3], int mapto_flag, float col[3], float *val, struct Render *re); -- cgit v1.2.3