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:
authorLukas Tönne <lukas.toenne@gmail.com>2014-12-01 21:19:45 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-04-20 13:17:16 +0300
commit833a11f89165b6671e33b1ae457e80545f5effd2 (patch)
treefc240a9e5d6a92befcb4f128c86ccdf7ce3ebb9b /source/blender/editors/datafiles
parent79959152e6aca06f554fd8b4a0294ef08bbea898 (diff)
New image file icons for hair brush tools and an according tool enum in
the Brush RNA.
Diffstat (limited to 'source/blender/editors/datafiles')
-rw-r--r--source/blender/editors/datafiles/CMakeLists.txt7
-rw-r--r--source/blender/editors/datafiles/SConscript7
2 files changed, 14 insertions, 0 deletions
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 2a84ca7f297..2ac800ee6e0 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -78,6 +78,13 @@ if(WITH_BLENDER)
data_to_c_simple(../../../../release/datafiles/brushicons/fill.png SRC)
data_to_c_simple(../../../../release/datafiles/brushicons/flatten.png SRC)
data_to_c_simple(../../../../release/datafiles/brushicons/grab.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/hairadd.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/haircomb.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/haircut.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/hairlength.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/hairpuff.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/hairsmooth.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/hairweight.png SRC)
data_to_c_simple(../../../../release/datafiles/brushicons/inflate.png SRC)
data_to_c_simple(../../../../release/datafiles/brushicons/layer.png SRC)
data_to_c_simple(../../../../release/datafiles/brushicons/lighten.png SRC)
diff --git a/source/blender/editors/datafiles/SConscript b/source/blender/editors/datafiles/SConscript
index 6bc8f21e384..e16d99ef15a 100644
--- a/source/blender/editors/datafiles/SConscript
+++ b/source/blender/editors/datafiles/SConscript
@@ -62,6 +62,13 @@ sources.extend((
os.path.join(env['DATA_SOURCES'], "fill.png.c"),
os.path.join(env['DATA_SOURCES'], "flatten.png.c"),
os.path.join(env['DATA_SOURCES'], "grab.png.c"),
+ os.path.join(env['DATA_SOURCES'], "hairadd.png.c"),
+ os.path.join(env['DATA_SOURCES'], "haircomb.png.c"),
+ os.path.join(env['DATA_SOURCES'], "haircut.png.c"),
+ os.path.join(env['DATA_SOURCES'], "hairlength.png.c"),
+ os.path.join(env['DATA_SOURCES'], "hairpuff.png.c"),
+ os.path.join(env['DATA_SOURCES'], "hairsmooth.png.c"),
+ os.path.join(env['DATA_SOURCES'], "hairweight.png.c"),
os.path.join(env['DATA_SOURCES'], "inflate.png.c"),
os.path.join(env['DATA_SOURCES'], "layer.png.c"),
os.path.join(env['DATA_SOURCES'], "lighten.png.c"),