diff options
| author | Dilith Jayakody <dilithjay@gmail.com> | 2022-03-17 07:11:09 +0300 |
|---|---|---|
| committer | Dilith Jayakody <dilithjay@gmail.com> | 2022-03-17 07:11:09 +0300 |
| commit | 255e1da82db9e0a2f40146c5e176964761314fa8 (patch) | |
| tree | 1bc6b181ea99a6995e77adf8cacabb0a12454411 /release/datafiles | |
| parent | 02ba154d6d5c655fb9c5e9bad6c93ac61b2ded33 (diff) | |
| parent | 859c062a2a3083f53d801fce4b722dcc52482e7e (diff) | |
Merge branch 'master' into soc-2021-curves
Diffstat (limited to 'release/datafiles')
| -rw-r--r-- | release/datafiles/blender_icons16/icon16_curves.dat (renamed from release/datafiles/blender_icons16/icon16_hair.dat) | bin | 1048 -> 1048 bytes |
| -rw-r--r-- | release/datafiles/blender_icons16/icon16_curves_data.dat (renamed from release/datafiles/blender_icons16/icon16_hair_data.dat) | bin | 1048 -> 1048 bytes |
| -rw-r--r-- | release/datafiles/blender_icons16/icon16_force_boid.dat | bin | 1048 -> 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) | bin | 1048 -> 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) | bin | 1048 -> 1048 bytes |
| -rw-r--r-- | release/datafiles/blender_icons32/icon32_curves.dat (renamed from release/datafiles/blender_icons32/icon32_hair.dat) | bin | 4120 -> 4120 bytes |
| -rw-r--r-- | release/datafiles/blender_icons32/icon32_curves_data.dat (renamed from release/datafiles/blender_icons32/icon32_hair_data.dat) | bin | 4120 -> 4120 bytes |
| -rw-r--r-- | release/datafiles/blender_icons32/icon32_force_boid.dat | bin | 4120 -> 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) | bin | 4120 -> 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) | bin | 4120 -> 4120 bytes |
10 files changed, 0 insertions, 0 deletions
diff --git a/release/datafiles/blender_icons16/icon16_hair.dat b/release/datafiles/blender_icons16/icon16_curves.dat Binary files differindex 6d550c12209..6d550c12209 100644 --- a/release/datafiles/blender_icons16/icon16_hair.dat +++ b/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 Binary files differindex ef891ae3fc4..ef891ae3fc4 100644 --- a/release/datafiles/blender_icons16/icon16_hair_data.dat +++ b/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 Binary files differindex 71f89bd7c04..f719054d84a 100644 --- a/release/datafiles/blender_icons16/icon16_force_boid.dat +++ b/release/datafiles/blender_icons16/icon16_force_boid.dat diff --git a/release/datafiles/blender_icons16/icon16_outliner_data_hair.dat b/release/datafiles/blender_icons16/icon16_outliner_data_curves.dat Binary files differindex ab0568bf81f..ab0568bf81f 100644 --- a/release/datafiles/blender_icons16/icon16_outliner_data_hair.dat +++ b/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 Binary files differindex b110c789c04..b110c789c04 100644 --- a/release/datafiles/blender_icons16/icon16_outliner_ob_hair.dat +++ b/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 Binary files differindex de7507384cc..de7507384cc 100644 --- a/release/datafiles/blender_icons32/icon32_hair.dat +++ b/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 Binary files differindex 5b03446438d..5b03446438d 100644 --- a/release/datafiles/blender_icons32/icon32_hair_data.dat +++ b/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 Binary files differindex 7fc7cb5ee8c..9043989024b 100644 --- a/release/datafiles/blender_icons32/icon32_force_boid.dat +++ b/release/datafiles/blender_icons32/icon32_force_boid.dat diff --git a/release/datafiles/blender_icons32/icon32_outliner_data_hair.dat b/release/datafiles/blender_icons32/icon32_outliner_data_curves.dat Binary files differindex 7c8d909d24e..7c8d909d24e 100644 --- a/release/datafiles/blender_icons32/icon32_outliner_data_hair.dat +++ b/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 Binary files differindex 0cadeea0af6..0cadeea0af6 100644 --- a/release/datafiles/blender_icons32/icon32_outliner_ob_hair.dat +++ b/release/datafiles/blender_icons32/icon32_outliner_ob_curves.dat |