From 9af791f8739edcb4fed15cda635cedf83987813c Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Wed, 16 Mar 2022 12:47:40 -0500 Subject: [PATCH] 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. --- .../{icon16_hair.dat => icon16_curves.dat} | Bin ...6_hair_data.dat => icon16_curves_data.dat} | Bin .../blender_icons16/icon16_force_boid.dat | Bin 1048 -> 1048 bytes ...ir.dat => icon16_outliner_data_curves.dat} | Bin ...hair.dat => icon16_outliner_ob_curves.dat} | Bin .../{icon32_hair.dat => icon32_curves.dat} | Bin ...2_hair_data.dat => icon32_curves_data.dat} | Bin .../blender_icons32/icon32_force_boid.dat | Bin 4120 -> 4120 bytes ...ir.dat => icon32_outliner_data_curves.dat} | Bin ...hair.dat => icon32_outliner_ob_curves.dat} | Bin .../blender/editors/datafiles/CMakeLists.txt | 8 ++++---- 11 files changed, 4 insertions(+), 4 deletions(-) rename release/datafiles/blender_icons16/{icon16_hair.dat => icon16_curves.dat} (100%) rename release/datafiles/blender_icons16/{icon16_hair_data.dat => icon16_curves_data.dat} (100%) rename release/datafiles/blender_icons16/{icon16_outliner_data_hair.dat => icon16_outliner_data_curves.dat} (100%) rename release/datafiles/blender_icons16/{icon16_outliner_ob_hair.dat => icon16_outliner_ob_curves.dat} (100%) rename release/datafiles/blender_icons32/{icon32_hair.dat => icon32_curves.dat} (100%) rename release/datafiles/blender_icons32/{icon32_hair_data.dat => icon32_curves_data.dat} (100%) rename release/datafiles/blender_icons32/{icon32_outliner_data_hair.dat => icon32_outliner_data_curves.dat} (100%) rename release/datafiles/blender_icons32/{icon32_outliner_ob_hair.dat => icon32_outliner_ob_curves.dat} (100%) 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 71f89bd7c0440f75ecd56ac975e9a5f6d398c668..f719054d84acac167b928f37977b0aa9eb1f556a 100644 GIT binary patch delta 20 ccmbQiF@s~nW=2M?$y*rh86R){!l=Ro07@eU=>Px# delta 20 ccmbQiF@s~nW=2NN$y*rh86R!_!l=Ro07?-C=Kufz 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 7fc7cb5ee8ca45304a05a9e6e49dc86f44b069e1..9043989024be2e3d6d1b218b91ffe3253dc060f9 100644 GIT binary patch delta 30 mcmbQCFhgO(X*O2D|NsAMPrkrb&3JRN4|_f1+0AFzeK-KpO$_@0 delta 30 mcmbQCFhgO(X*O1Y|NsB1Prkrb&3JXP4|_f1>CI=@eK-KovkdS6 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