diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-17 06:49:31 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-17 06:49:31 +0400 |
| commit | 9d2d3a8be7c3c0b101e7f0f33bb1a04c69deaf67 (patch) | |
| tree | 93345dd6c9c76d3c3052573d45e7230918a197a8 /source/blender/blenkernel/intern/scene.c | |
| parent | 1e0fd0d4c14824e856424000e1122dcb1c8b44dd (diff) | |
2.5 Paint:
* Converted vertex paint and weight paint to use the new Paint type
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index f1727cc6b59..dc1a55ed0eb 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -163,14 +163,14 @@ Scene *copy_scene(Main *bmain, Scene *sce, int type) ts->vpaint->paintcursor= NULL; ts->vpaint->vpaint_prev= NULL; ts->vpaint->wpaint_prev= NULL; - id_us_plus((ID *)ts->vpaint->brush); + copy_paint(&ts->vpaint->paint, &ts->vpaint->paint); } if(ts->wpaint) { ts->wpaint= MEM_dupallocN(ts->wpaint); ts->wpaint->paintcursor= NULL; ts->wpaint->vpaint_prev= NULL; ts->wpaint->wpaint_prev= NULL; - id_us_plus((ID *)ts->wpaint->brush); + copy_paint(&ts->wpaint->paint, &ts->wpaint->paint); } if(ts->sculpt) { ts->sculpt= MEM_dupallocN(ts->sculpt); @@ -272,10 +272,14 @@ void free_scene(Scene *sce) BLI_freelistN(&sce->r.layers); if(sce->toolsettings) { - if(sce->toolsettings->vpaint) + if(sce->toolsettings->vpaint) { + free_paint(&sce->toolsettings->vpaint->paint); MEM_freeN(sce->toolsettings->vpaint); - if(sce->toolsettings->wpaint) + } + if(sce->toolsettings->wpaint) { + free_paint(&sce->toolsettings->wpaint->paint); MEM_freeN(sce->toolsettings->wpaint); + } if(sce->toolsettings->sculpt) { free_paint(&sce->toolsettings->sculpt->paint); MEM_freeN(sce->toolsettings->sculpt); |