[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29349] branches/soc-2010-nicolasbishop/ source/blender/blenkernel/intern/multires.c: * Fixed masks not updating correctly from lower levels.

[Nicholas Bishop]

Revision: 29349
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29349
Author:   nicholasbishop
Date:     2010-06-09 00:40:02 +0200 (Wed, 09 Jun 2010)

Log Message:
-----------
* Fixed masks not updating correctly from lower levels.

Modified Paths:
--------------
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/multires.c

Modified: branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/multires.c
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/multires.c	2010-06-08 21:58:21 UTC (rev 29348)
+++ branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/multires.c	2010-06-08 22:40:02 UTC (rev 29349)
@@ -695,14 +695,14 @@
 					if(mask && smask && stored_mask) {
 						switch(op) {
 						case APPLY_DISPS:
-							*mask = stored_mask[stored_offset];
+							*mask = *smask + stored_mask[stored_offset];
 							break;
 						case CALC_DISPS:
-							stored_mask[stored_offset] = *mask;
+							stored_mask[stored_offset] = *mask - *smask;
 							CLAMP(stored_mask[stored_offset], 0, 1);
 							break;
 						case ADD_DISPS:
-							stored_mask[stored_offset] = *mask;
+							stored_mask[stored_offset] += *mask;
 							CLAMP(stored_mask[stored_offset], 0, 1);
 							break;
 						}