[Bf-blender-cvs] [9af791f8739] master: Fix: Update icons for hair to curves rename
Hans Goudey
noreply at git.blender.org
Wed Mar 16 18:48:19 CET 2022
Commit: 9af791f8739edcb4fed15cda635cedf83987813c
Author: Hans Goudey
Date: Wed Mar 16 12:47:40 2022 -0500
Branches: master
https://developer.blender.org/rB9af791f8739edcb4fed15cda635cedf83987813c
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.
===================================================================
R100 release/datafiles/blender_icons16/icon16_hair.dat release/datafiles/blender_icons16/icon16_curves.dat
R100 release/datafiles/blender_icons16/icon16_hair_data.dat release/datafiles/blender_icons16/icon16_curves_data.dat
M release/datafiles/blender_icons16/icon16_force_boid.dat
R100 release/datafiles/blender_icons16/icon16_outliner_data_hair.dat release/datafiles/blender_icons16/icon16_outliner_data_curves.dat
R100 release/datafiles/blender_icons16/icon16_outliner_ob_hair.dat release/datafiles/blender_icons16/icon16_outliner_ob_curves.dat
R100 release/datafiles/blender_icons32/icon32_hair.dat release/datafiles/blender_icons32/icon32_curves.dat
R100 release/datafiles/blender_icons32/icon32_hair_data.dat release/datafiles/blender_icons32/icon32_curves_data.dat
M release/datafiles/blender_icons32/icon32_force_boid.dat
R100 release/datafiles/blender_icons32/icon32_outliner_data_hair.dat release/datafiles/blender_icons32/icon32_outliner_data_curves.dat
R100 release/datafiles/blender_icons32/icon32_outliner_ob_hair.dat release/datafiles/blender_icons32/icon32_outliner_ob_curves.dat
M source/blender/editors/datafiles/CMakeLists.txt
===================================================================
diff --git a/release/datafiles/blender_icons16/icon16_hair.dat b/release/datafiles/blender_icons16/icon16_curves.dat
similarity index 100%
rename from release/datafiles/blender_icons16/icon16_hair.dat
rename to release/datafiles/blender_icons16/icon16_curves.dat
diff --git a/release/datafiles/blender_icons16/icon16_hair_data.dat b/release/datafiles/blender_icons16/icon16_curves_data.dat
similarity index 100%
rename from release/datafiles/blender_icons16/icon16_hair_data.dat
rename to release/datafiles/blender_icons16/icon16_curves_data.dat
diff --git a/release/datafiles/blender_icons16/icon16_force_boid.dat b/release/datafiles/blender_icons16/icon16_force_boid.dat
index 71f89bd7c04..f719054d84a 100644
Binary files a/release/datafiles/blender_icons16/icon16_force_boid.dat and b/release/datafiles/blender_icons16/icon16_force_boid.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_outliner_data_hair.dat b/release/datafiles/blender_icons16/icon16_outliner_data_curves.dat
similarity index 100%
rename from release/datafiles/blender_icons16/icon16_outliner_data_hair.dat
rename to release/datafiles/blender_icons16/icon16_outliner_data_curves.dat
diff --git a/release/datafiles/blender_icons16/icon16_outliner_ob_hair.dat b/release/datafiles/blender_icons16/icon16_outliner_ob_curves.dat
similarity index 100%
rename from release/datafiles/blender_icons16/icon16_outliner_ob_hair.dat
rename to release/datafiles/blender_icons16/icon16_outliner_ob_curves.dat
diff --git a/release/datafiles/blender_icons32/icon32_hair.dat b/release/datafiles/blender_icons32/icon32_curves.dat
similarity index 100%
rename from release/datafiles/blender_icons32/icon32_hair.dat
rename to release/datafiles/blender_icons32/icon32_curves.dat
diff --git a/release/datafiles/blender_icons32/icon32_hair_data.dat b/release/datafiles/blender_icons32/icon32_curves_data.dat
similarity index 100%
rename from release/datafiles/blender_icons32/icon32_hair_data.dat
rename to release/datafiles/blender_icons32/icon32_curves_data.dat
diff --git a/release/datafiles/blender_icons32/icon32_force_boid.dat b/release/datafiles/blender_icons32/icon32_force_boid.dat
index 7fc7cb5ee8c..9043989024b 100644
Binary files a/release/datafiles/blender_icons32/icon32_force_boid.dat and b/release/datafiles/blender_icons32/icon32_force_boid.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_outliner_data_hair.dat b/release/datafiles/blender_icons32/icon32_outliner_data_curves.dat
similarity index 100%
rename from release/datafiles/blender_icons32/icon32_outliner_data_hair.dat
rename to release/datafiles/blender_icons32/icon32_outliner_data_curves.dat
diff --git a/release/datafiles/blender_icons32/icon32_outliner_ob_hair.dat b/release/datafiles/blender_icons32/icon32_outliner_ob_curves.dat
similarity index 100%
rename from release/datafiles/blender_icons32/icon32_outliner_ob_hair.dat
rename to release/datafiles/blender_icons32/icon32_outliner_ob_curves.dat
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
More information about the Bf-blender-cvs
mailing list