diff options
author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2010-07-20 15:32:30 +0400 |
---|---|---|
committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2010-07-20 15:32:30 +0400 |
commit | b618a335f5e7b5b3d291aa0cba8be232b79e9a4e (patch) | |
tree | 1496b8f8c251636d4393de64940c72d07d3346db /source/blender/blenloader | |
parent | d8792465e08313d7ca11ea6f821886330f499540 (diff) |
* Made the default sculpt icons an internal part of the executable
* Default icons can be selected from a menu
* Option to make a custom icon from a file is present but the UI is disabled because of a mysterious crash
* New startup.blend that has the appropriate icons selected
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index d3bf136c529..06a0eb32a92 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1541,9 +1541,8 @@ 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); - // Image icons not saved if only used as an icon, - // but if it used elsewhere in the file it will have been saved - brush->image_icon= newlibadr_us(fd, brush->id.lib, brush->image_icon); + brush->preview=0; + brush->icon_imbuf=0; } } } @@ -10984,10 +10983,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main) for (brush= main->brush.first; brush; brush= brush->id.next) { /* Sanity Check */ - // brush icon loaded but not the path - //if (brush->image_icon && !(brush->image_icon_path[0])) - // BLI_strncpy(brush->image_icon_path, brush->image_icon->name, sizeof(brush->image_icon_path)); - // infinite number of dabs if (brush->spacing == 0) brush->spacing = 10; |