Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2012-12-18 19:10:54 +0400
committerTon Roosendaal <ton@blender.org>2012-12-18 19:10:54 +0400
commit3c2b5e7fc0328af24a45ccc704662b2e9fcc4fa7 (patch)
tree7e39cd6d051e049b048e79ccf74c8c1ce9949284
parentf91eefcc62f89abf9e02e973fc975c5eb8d05007 (diff)
Blender icons now are in the 21st century too!
Default size for bitmap now is 32x32 pixels. Code change for higher densities is easy, all under review. Let's first check this!
-rw-r--r--release/datafiles/blender_icons.pngbin230694 -> 551824 bytes
-rw-r--r--release/datafiles/blender_icons.svg12
-rw-r--r--source/blender/editors/interface/interface_icons.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/release/datafiles/blender_icons.png b/release/datafiles/blender_icons.png
index d96dd5d4886..18926a75f9f 100644
--- a/release/datafiles/blender_icons.png
+++ b/release/datafiles/blender_icons.png
Binary files differ
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index ab3a07b8fad..1e1f89d9b83 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -14,14 +14,14 @@
height="640"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.48.3.1 r9886"
+ inkscape:version="0.48.2 r9819"
version="1.0"
sodipodi:docname="blender_icons.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
style="display:inline;enable-background:new"
inkscape:export-filename="blender_icons.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
+ inkscape:export-xdpi="180"
+ inkscape:export-ydpi="180">
<title
id="title49470">Blender icons v. 2.5.06</title>
<defs
@@ -49943,10 +49943,10 @@
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
- inkscape:window-width="1366"
- inkscape:window-height="686"
+ inkscape:window-width="2560"
+ inkscape:window-height="1392"
inkscape:window-x="0"
- inkscape:window-y="27"
+ inkscape:window-y="0"
inkscape:snap-nodes="true"
inkscape:snap-bbox="false"
showguides="true"
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 79dd01fd400..1369f399c89 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -81,9 +81,9 @@
#define ICON_GRID_COLS 26
#define ICON_GRID_ROWS 30
-#define ICON_GRID_MARGIN 5
-#define ICON_GRID_W 16
-#define ICON_GRID_H 16
+#define ICON_GRID_MARGIN 10
+#define ICON_GRID_W 32
+#define ICON_GRID_H 32
typedef struct IconImage {
int w;