archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.6 UI Modifier Icons:

Browse Source 
* New Ocean Icon, created by Leon Cheung. Thanks! Approved by Lukas and myself.
* New Warp Icon, created by "Zafio"

Blender artists Thread where the Icons come from: http://blenderartists.org/forum/showthread.php?243354-Call-for-Modifier-Icons!
This commit is contained in:
Thomas Dinges
2012-02-12 19:57:47 +00:00
parent f7c032b765
commit 9c2d3a8ed1
5 changed files with 6869 additions and 6828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13681
source/blender/editors/datafiles/blender_icons.png.c
View File

File diff suppressed because it is too large Load Diff

4
source/blender/editors/include/UI_icons.h
View File

@@ -590,9 +590,9 @@ DEF_ICON(MOD_SCREW)
DEF_ICON(MOD_VERTEX_WEIGHT)
DEF_ICON(MOD_DYNAMICPAINT)
DEF_ICON(MOD_REMESH)
DEF_ICON(MOD_OCEAN)
DEF_ICON(MOD_WARP)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK163)
DEF_ICON(BLANK164)
DEF_ICON(BLANK165)
DEF_ICON(BLANK166)
DEF_ICON(BLANK167)

4
source/blender/editors/space_outliner/outliner_draw.c
View File

@@ -1023,7 +1023,9 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
case eModifierType_DynamicPaint:
UI_icon_draw(x, y, ICON_MOD_DYNAMICPAINT); break;
case eModifierType_Ocean:
UI_icon_draw(x, y, ICON_MOD_WAVE); break;
UI_icon_draw(x, y, ICON_MOD_OCEAN); break;
case eModifierType_Warp:
UI_icon_draw(x, y, ICON_MOD_WARP); break;
default:
UI_icon_draw(x, y, ICON_DOT); break;
}