diff options
author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2010-07-20 06:18:10 +0400 |
---|---|---|
committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2010-07-20 06:18:10 +0400 |
commit | 80e63236464a7e864c45e163dd059ffe61735926 (patch) | |
tree | 4fb120608572fd4a3126838be24253e68bf1e693 /source/blender/makesdna | |
parent | 1033b60824c291089e568e1b20b8b1a734cb28e1 (diff) |
* Images for brush icons are now reloaded when they are needed from an external file
* First, try to load the file from the given filename. This is either absolute or relative to the current .blend
* If file is found using the given filename directly then look for the file in the datafiles/brushicons directory (local, user, or system).
* Note: This commit does not update the .blend to reference the default icons
* Note: This commit does not make sure that the build system copies the default icons to the 2.52/datafiles/brushicons directory
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 3b2ce6b436e..5fdc3e6dc5c 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -54,6 +54,7 @@ typedef struct Brush { struct CurveMapping *curve; /* falloff curve */ struct MTex mtex; struct Image *image_icon; + char image_icon_path[240]; float normal_weight; |