diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-07-26 08:00:09 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-07-26 08:00:09 +0400 |
| commit | ec19c7dffca92119c964dc18ef3af6efd1d8c0c9 (patch) | |
| tree | 549f8b92d3badebd2a0e25710a86b639df9502c5 /source/blender/makesrna/RNA_enum_types.h | |
| parent | 6561da03ae1f0bd90b257c096f38c8432f413076 (diff) | |
== Sculpt ==
Fixed brush icons loading slowly
* Changed brush icon property from an enum to a flag that toggles whether a custom file is used for the brush icon
* Changed get_brush_icon to only handle loading external icons, built-ins are handled through the regular icon system
* Modified preview icon drawing to allow built-in icons
* When not using a custom icon, a default icon is selected based on the current tool
TODO:
* Allowing preview to show built-in icons makes the brush texture selector look ugly when nothing is selected. As discussed on IRC though, the nothing-selected state needs to be clarified anyway; I'll address this in another commit
* Use image browser when selecting a custom icon
* Selecting the default icon is ugly (uses the active object's mode), this can be fixed by making brushes know which paint mode they are part of
Diffstat (limited to 'source/blender/makesrna/RNA_enum_types.h')
| -rw-r--r-- | source/blender/makesrna/RNA_enum_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index bb0a1ba2c52..65870d54c11 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -66,6 +66,8 @@ extern EnumPropertyItem event_type_items[]; extern EnumPropertyItem operator_return_items[]; extern EnumPropertyItem brush_sculpt_tool_items[]; +extern EnumPropertyItem brush_vertexpaint_tool_items[]; +extern EnumPropertyItem brush_imagepaint_tool_items[]; extern EnumPropertyItem texture_type_items[]; |