[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37383] branches/soc-2011-onion/source/ blender/editors/sculpt_paint/paint_mask.c: Revision: 30785

[Jason Wilkins]

Revision: 37383
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37383
Author:   jwilkins
Date:     2011-06-10 19:49:16 +0000 (Fri, 10 Jun 2011)
Log Message:
-----------
Revision: 30785
Author: nicholasbishop
Date: 7:09:25 PM, Monday, July 26, 2010
Message:
== Sculpt ==

* Added back mask brush, accidentally removed during last merge
* Removed an incorrect assert in paint mask

** jwilkins:
** removed incorrect assert, but mask brush problem didn't occur

Modified Paths:
--------------
    branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_mask.c

Modified: 
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_mask.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_mask.c    
2011-06-10 19:47:53 UTC (rev 37382)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_mask.c    
2011-06-10 19:49:16 UTC (rev 37383)
@@ -453,7 +453,8 @@
        float *griddata;
        int i;
 
-       assert(cdm && layer_name);
+       if(!cdm)
+               return;
 
        for(i = 0; i < me->totface; ++i) {
                switch(op) {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs