From ec19c7dffca92119c964dc18ef3af6efd1d8c0c9 Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Mon, 26 Jul 2010 04:00:09 +0000 Subject: == 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 --- source/blender/makesrna/RNA_enum_types.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/makesrna/RNA_enum_types.h') 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[]; -- cgit v1.2.3