griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Dynamic Paint:

Browse Source 
* Forgot to change node socket ids.
* Fixed "shrink" effect artifacts on wetmap.

There was a typo in previous commit message. Should be "alpha support for vertex color rendering".
This commit is contained in:
Miika Hamalainen
2011-07-24 17:40:02 +00:00
parent 6ed039642a
commit 36802232d7
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/blenkernel/intern/dynamicpaint.c
View File

@@ -3822,18 +3822,14 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force
w_factor = (1.0f - ePoint->wetness)/8 * (pPoint->wetness - ePoint->wetness) * speed_scale;
if (w_factor < 0.0f) w_factor = 0.0f;
if (a_factor) {
pPoint->alpha -= a_factor;
if (pPoint->alpha < 0.0f) pPoint->alpha = 0.0f;
pPoint->wetness -= a_factor;
pPoint->alpha -= a_factor;
if (pPoint->alpha < 0.0f) pPoint->alpha = 0.0f;
}
else {
pPoint->e_alpha -= ea_factor;
if (pPoint->e_alpha < 0.0f) pPoint->e_alpha = 0.0f;
pPoint->wetness -= w_factor;
if (pPoint->wetness < 0.0f) pPoint->wetness = 0.0f;
}
pPoint->e_alpha -= ea_factor;
if (pPoint->e_alpha < 0.0f) pPoint->e_alpha = 0.0f;
pPoint->wetness -= w_factor;
if (pPoint->wetness < 0.0f) pPoint->wetness = 0.0f;
}
}
}

4
source/blender/nodes/intern/SHD_util.h
View File

@@ -93,8 +93,8 @@ typedef struct ShaderCallData {
#define GEOM_OUT_UV 4
#define GEOM_OUT_NORMAL 5
#define GEOM_OUT_VCOL 6
#define GEOM_OUT_FRONTBACK 7
#define GEOM_OUT_VCOL_ALPHA 8
#define GEOM_OUT_VCOL_ALPHA 7
#define GEOM_OUT_FRONTBACK 8
/* input socket defines */