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:
authorHans Goudey <h.goudey@me.com>2022-03-16 20:47:40 +0300
committerHans Goudey <h.goudey@me.com>2022-03-16 20:48:00 +0300
commit9af791f8739edcb4fed15cda635cedf83987813c (patch)
treea361050aa66021b7a039f0abcd210df4ee50994f
parent7e06fc11b7cbf532bd8017b270f53e3a11f21523 (diff)
Fix: Update icons for hair to curves rename
ddf189892c596d939 missed recreating the icons with the new names. This commit runs `make icons` and replaces the names in CMake.
-rw-r--r--release/datafiles/blender_icons16/icon16_curves.dat (renamed from release/datafiles/blender_icons16/icon16_hair.dat)bin1048 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_curves_data.dat (renamed from release/datafiles/blender_icons16/icon16_hair_data.dat)bin1048 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_force_boid.datbin1048 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_outliner_data_curves.dat (renamed from release/datafiles/blender_icons16/icon16_outliner_data_hair.dat)bin1048 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_outliner_ob_curves.dat (renamed from release/datafiles/blender_icons16/icon16_outliner_ob_hair.dat)bin1048 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_curves.dat (renamed from release/datafiles/blender_icons32/icon32_hair.dat)bin4120 -> 4120 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_curves_data.dat (renamed from release/datafiles/blender_icons32/icon32_hair_data.dat)bin4120 -> 4120 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_force_boid.datbin4120 -> 4120 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_outliner_data_curves.dat (renamed from release/datafiles/blender_icons32/icon32_outliner_data_hair.dat)bin4120 -> 4120 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_outliner_ob_curves.dat (renamed from release/datafiles/blender_icons32/icon32_outliner_ob_hair.dat)bin4120 -> 4120 bytes
-rw-r--r--source/blender/editors/datafiles/CMakeLists.txt8
11 files changed, 4 insertions, 4 deletions
diff --git a/release/datafiles/blender_icons16/icon16_hair.dat b/release/datafiles/blender_icons16/icon16_curves.dat
index 6d550c12209..6d550c12209 100644
--- a/release/datafiles/blender_icons16/icon16_hair.dat
+++ b/release/datafiles/blender_icons16/icon16_curves.dat
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_hair_data.dat b/release/datafiles/blender_icons16/icon16_curves_data.dat
index ef891ae3fc4..ef891ae3fc4 100644
--- a/release/datafiles/blender_icons16/icon16_hair_data.dat
+++ b/release/datafiles/blender_icons16/icon16_curves_data.dat
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_force_boid.dat b/release/datafiles/blender_icons16/icon16_force_boid.dat
index 71f89bd7c04..f719054d84a 100644
--- a/release/datafiles/blender_icons16/icon16_force_boid.dat
+++ b/release/datafiles/blender_icons16/icon16_force_boid.dat
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_outliner_data_hair.dat b/release/datafiles/blender_icons16/icon16_outliner_data_curves.dat
index ab0568bf81f..ab0568bf81f 100644
--- a/release/datafiles/blender_icons16/icon16_outliner_data_hair.dat
+++ b/release/datafiles/blender_icons16/icon16_outliner_data_curves.dat
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_outliner_ob_hair.dat b/release/datafiles/blender_icons16/icon16_outliner_ob_curves.dat
index b110c789c04..b110c789c04 100644
--- a/release/datafiles/blender_icons16/icon16_outliner_ob_hair.dat
+++ b/release/datafiles/blender_icons16/icon16_outliner_ob_curves.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_hair.dat b/release/datafiles/blender_icons32/icon32_curves.dat
index de7507384cc..de7507384cc 100644
--- a/release/datafiles/blender_icons32/icon32_hair.dat
+++ b/release/datafiles/blender_icons32/icon32_curves.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_hair_data.dat b/release/datafiles/blender_icons32/icon32_curves_data.dat
index 5b03446438d..5b03446438d 100644
--- a/release/datafiles/blender_icons32/icon32_hair_data.dat
+++ b/release/datafiles/blender_icons32/icon32_curves_data.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_force_boid.dat b/release/datafiles/blender_icons32/icon32_force_boid.dat
index 7fc7cb5ee8c..9043989024b 100644
--- a/release/datafiles/blender_icons32/icon32_force_boid.dat
+++ b/release/datafiles/blender_icons32/icon32_force_boid.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_outliner_data_hair.dat b/release/datafiles/blender_icons32/icon32_outliner_data_curves.dat
index 7c8d909d24e..7c8d909d24e 100644
--- a/release/datafiles/blender_icons32/icon32_outliner_data_hair.dat
+++ b/release/datafiles/blender_icons32/icon32_outliner_data_curves.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_outliner_ob_hair.dat b/release/datafiles/blender_icons32/icon32_outliner_ob_curves.dat
index 0cadeea0af6..0cadeea0af6 100644
--- a/release/datafiles/blender_icons32/icon32_outliner_ob_hair.dat
+++ b/release/datafiles/blender_icons32/icon32_outliner_ob_curves.dat
Binary files differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index edbdc1ee96f..48f9c50ad4e 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -595,9 +595,9 @@ set(ICON_NAMES
axis_top
layer_used
layer_active
- outliner_ob_hair
- outliner_data_hair
- hair_data
+ outliner_ob_curves
+ outliner_data_curves
+ curves_data
outliner_ob_pointcloud
outliner_data_pointcloud
pointcloud_data
@@ -652,7 +652,7 @@ set(ICON_NAMES
matsphere
matcube
monkey
- hair
+ curves
aliased
antialiased
mat_sphere_sky