[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39100] branches/soc-2011-salad: Merged latest commit from soc-2011-carrot into soc-2011-salad.

[Miika Hamalainen]

Revision: 39100
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39100
Author:   miikah
Date:     2011-08-06 14:42:46 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Merged latest commit from soc-2011-carrot into soc-2011-salad.

Modified Paths:
--------------
    branches/soc-2011-salad/source/blender/blenkernel/intern/dynamicpaint.c

Property Changed:
----------------
    branches/soc-2011-salad/


Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39080
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38934
/branches/soc-2011-tomato:36831-39069
/trunk/blender:36834-39050
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38934
/branches/soc-2011-tomato:36831-39069
/trunk/blender:36834-39050

Modified: branches/soc-2011-salad/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/intern/dynamicpaint.c	2011-08-06 14:40:04 UTC (rev 39099)
+++ branches/soc-2011-salad/source/blender/blenkernel/intern/dynamicpaint.c	2011-08-06 14:42:46 UTC (rev 39100)
@@ -1520,6 +1520,7 @@
 							mvert[i].co[1] += normal[1]*wPoint[i].height;
 							mvert[i].co[2] += normal[2]*wPoint[i].height;
 						}
+						CDDM_calc_normals(result);
 					}
 
 					/* displace */