[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37141] branches/soc-2011-onion: Revision: 29349

[Jason Wilkins]

Revision: 37141
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37141
Author:   jwilkins
Date:     2011-06-03 17:42:24 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
Revision: 29349
Author: nicholasbishop
Date: 5:40:02 PM, Tuesday, June 08, 2010
Message:
* Fixed masks not updating correctly from lower levels.

Modified Paths:
--------------
    branches/soc-2011-onion/source/blender/blenkernel/intern/multires.c

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


Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-29347,29350
/trunk/blender:36833-37054
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-29347,29349-29350
/trunk/blender:36833-37054

Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/multires.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/multires.c	2011-06-03 17:40:59 UTC (rev 37140)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/multires.c	2011-06-03 17:42:24 UTC (rev 37141)
@@ -878,14 +878,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;
 				}