Revision: 38662
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38662
Author: miikah
Date: 2011-07-24 17:40:02 +0000 (Sun, 24 Jul 2011)
Log Message:
-----------
Dynamic Paint:
* 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".
Modified Paths:
--------------
branches/soc-2011-carrot/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-carrot/source/blender/nodes/intern/SHD_util.h
Modified:
branches/soc-2011-carrot/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- branches/soc-2011-carrot/source/blender/blenkernel/intern/dynamicpaint.c
2011-07-24 17:03:33 UTC (rev 38661)
+++ branches/soc-2011-carrot/source/blender/blenkernel/intern/dynamicpaint.c
2011-07-24 17:40:02 UTC (rev 38662)
@@ -3822,18 +3822,14 @@
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;
}
}
}
Modified: branches/soc-2011-carrot/source/blender/nodes/intern/SHD_util.h
===================================================================
--- branches/soc-2011-carrot/source/blender/nodes/intern/SHD_util.h
2011-07-24 17:03:33 UTC (rev 38661)
+++ branches/soc-2011-carrot/source/blender/nodes/intern/SHD_util.h
2011-07-24 17:40:02 UTC (rev 38662)
@@ -93,8 +93,8 @@
#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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
