diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2010-07-20 17:42:27 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2010-07-20 17:42:27 +0400 |
| commit | 886ce5a35101ea8bfef9c02745a94b1ab017f12f (patch) | |
| tree | cb3f418bb74daa4411a9267039bcfa6e957bfbdc /source/blender/blenloader/intern | |
| parent | a1494105657e0cc428b6e9163df500d0fe5b3176 (diff) | |
* can use file for brush icon
* fixed memory leaks
* moved some of the brush icon code around
* the update of the icon after a change is more responsive
Diffstat (limited to 'source/blender/blenloader/intern')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 06a0eb32a92..de2a3cd47cc 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1540,9 +1540,6 @@ static void lib_link_brush(FileData *fd, Main *main) brush->mtex.tex= newlibadr_us(fd, brush->id.lib, brush->mtex.tex); brush->clone.image= newlibadr_us(fd, brush->id.lib, brush->clone.image); - - brush->preview=0; - brush->icon_imbuf=0; } } } @@ -1557,6 +1554,9 @@ static void direct_link_brush(FileData *fd, Brush *brush) direct_link_curvemapping(fd, brush->curve); else brush_curve_preset(brush, CURVE_PRESET_SHARP); + + brush->preview= NULL; + brush->icon_imbuf= NULL; } static void direct_link_script(FileData *fd, Script *script) |