diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index c1c08515188..e94a26e3eda 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -1,6 +1,6 @@ - + @@ -1489,8 +1489,6 @@ - - @@ -1547,10 +1545,10 @@ + - @@ -2910,88 +2908,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - - - - + + + + - - + + - - + + - - - + + + - - + + - + - - + + - + - + @@ -3004,7 +2974,7 @@ - + @@ -3032,7 +3002,7 @@ - + @@ -3043,7 +3013,7 @@ - + @@ -3053,7 +3023,7 @@ - + @@ -3071,7 +3041,7 @@ - + @@ -3093,33 +3063,33 @@ - + - - - + + + - + - + - - - + + + @@ -3146,25 +3116,25 @@ - + - + - + - - - - + + + + @@ -3183,32 +3153,32 @@ - + - + - + - + - + - + @@ -3227,11 +3197,11 @@ - + - + @@ -3249,11 +3219,11 @@ - + - + @@ -3267,7 +3237,7 @@ - + @@ -3283,7 +3253,7 @@ - + @@ -3291,15 +3261,15 @@ - + - + - + - + @@ -3308,7 +3278,7 @@ - + @@ -3321,7 +3291,7 @@ - + @@ -3339,7 +3309,7 @@ - + @@ -3364,7 +3334,7 @@ - + @@ -3378,7 +3348,7 @@ - + @@ -3417,12 +3387,12 @@ - + - + @@ -3449,8 +3419,8 @@ - - + + @@ -3459,14 +3429,14 @@ - + - + @@ -3485,7 +3455,7 @@ - + @@ -3494,30 +3464,30 @@ - + - + - + - + - + @@ -3526,7 +3496,7 @@ - + @@ -3538,7 +3508,7 @@ - + @@ -3558,7 +3528,7 @@ - + @@ -3568,7 +3538,7 @@ - + @@ -3591,7 +3561,7 @@ - + @@ -3611,12 +3581,12 @@ - + - + @@ -3631,11 +3601,11 @@ - + - + @@ -3655,7 +3625,7 @@ - + @@ -3664,8 +3634,8 @@ - - + + @@ -3706,17 +3676,17 @@ - + - + - + @@ -3724,12 +3694,12 @@ - + - + @@ -3740,20 +3710,20 @@ - + - + - + - + @@ -3804,7 +3774,7 @@ - + @@ -3813,7 +3783,7 @@ - + @@ -3823,13 +3793,13 @@ - + - + @@ -3839,7 +3809,7 @@ - + @@ -3863,13 +3833,13 @@ - + - + - + @@ -3877,7 +3847,7 @@ - + @@ -3889,27 +3859,27 @@ - + - + - + - + - + @@ -3917,7 +3887,7 @@ - + @@ -3936,13 +3906,13 @@ - + - + @@ -3950,7 +3920,7 @@ - + @@ -3980,23 +3950,23 @@ - + - + - - + + - + @@ -4008,7 +3978,7 @@ - + @@ -4024,13 +3994,13 @@ - - - + + + - + @@ -4050,7 +4020,7 @@ - + @@ -4066,7 +4036,7 @@ - + @@ -4081,12 +4051,12 @@ - + - + @@ -4100,22 +4070,22 @@ - + - + - + - + @@ -4125,12 +4095,12 @@ - + - + @@ -4149,11 +4119,11 @@ - + - + @@ -4162,11 +4132,11 @@ - + - + @@ -4184,7 +4154,7 @@ - + @@ -4197,13 +4167,7 @@ - - - - - - - + @@ -4232,11 +4196,11 @@ - + - + @@ -4260,14 +4224,14 @@ - + - + @@ -4287,26 +4251,26 @@ - + - + - + - + - + @@ -4320,10 +4284,9 @@ - - + + - @@ -4332,53 +4295,52 @@ - - - + + - - - - + + + + - + - + - + - - + + - - - - + + + + - + @@ -4401,9 +4363,9 @@ - + - + @@ -4415,8 +4377,8 @@ - - + + @@ -4461,11 +4423,6 @@ - - - - - @@ -4480,22 +4437,22 @@ - + - - + + - - - + + + - + @@ -4507,31 +4464,31 @@ - + - + - + - + - + - + @@ -4541,34 +4498,34 @@ - + - + - + - + - + - + - + @@ -4577,7 +4534,7 @@ - + @@ -4598,7 +4555,7 @@ - + @@ -4606,7 +4563,7 @@ - + @@ -4615,7 +4572,7 @@ - + @@ -4624,7 +4581,7 @@ - + @@ -4682,7 +4639,7 @@ - + @@ -4690,7 +4647,7 @@ - + @@ -4706,30 +4663,30 @@ - + - + - + - + - + - + @@ -4738,7 +4695,7 @@ - + @@ -4751,7 +4708,7 @@ - + @@ -4760,12 +4717,12 @@ - + - + - + @@ -4792,12 +4749,12 @@ - + - + @@ -4833,7 +4790,7 @@ - + @@ -4841,7 +4798,7 @@ - + @@ -4861,11 +4818,11 @@ - + - + @@ -4876,7 +4833,7 @@ - + @@ -4887,7 +4844,6 @@ - @@ -4923,7 +4879,7 @@ - + @@ -4932,24 +4888,24 @@ - + - + - + - + @@ -4958,7 +4914,7 @@ - + @@ -4971,7 +4927,7 @@ - + @@ -4979,11 +4935,11 @@ - + - + @@ -5004,15 +4960,15 @@ - + - + - + @@ -5020,7 +4976,7 @@ - + @@ -5052,32 +5008,32 @@ - - + + - + - + - - + + - + @@ -5092,23 +5048,23 @@ - + - + - + - + - + - + @@ -5116,30 +5072,30 @@ - + - + - + - + - - - + + + - + @@ -5147,15 +5103,15 @@ - + - + - + @@ -5166,7 +5122,7 @@ - + @@ -5177,19 +5133,19 @@ - + - - + + - + @@ -5199,7 +5155,7 @@ - + @@ -5227,11 +5183,9 @@ - - - - - + + + @@ -5243,7 +5197,7 @@ - + @@ -5251,7 +5205,7 @@ - + @@ -5263,7 +5217,7 @@ - + @@ -5280,24 +5234,24 @@ - + - + - + - - + + - + @@ -5309,11 +5263,11 @@ - + - + @@ -5323,7 +5277,7 @@ - + @@ -5334,7 +5288,7 @@ - + @@ -5354,38 +5308,33 @@ - + - + - - - - - - + - - - - + + + + - + - + @@ -5397,10 +5346,10 @@ - + - + @@ -5410,7 +5359,7 @@ - + @@ -5423,7 +5372,7 @@ - + @@ -5436,23 +5385,23 @@ - + - + - + - + @@ -5465,36 +5414,26 @@ - + - - - - - - - - - - - + - + - + @@ -5516,12 +5455,12 @@ - + - + @@ -5533,16 +5472,10 @@ - - - - - - - - - - + + + + @@ -5566,7 +5499,7 @@ - + @@ -5608,7 +5541,7 @@ - + @@ -5646,7 +5579,7 @@ - + @@ -5663,7 +5596,7 @@ - + @@ -5694,7 +5627,7 @@ - + @@ -5702,11 +5635,11 @@ - + - + @@ -5726,7 +5659,6 @@ - @@ -5736,15 +5668,6 @@ - - - - - - - - - @@ -5787,7 +5710,7 @@ - + @@ -5795,10 +5718,143 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + A + B + C + D + E + F + G + M + N + O + P + Q + R + S + T + U + V + W + X + Y + Z + @ + & + % + ? + diff --git a/release/datafiles/blender_icons16/icon16_checkbox_dehlt.dat b/release/datafiles/blender_icons16/icon16_checkbox_dehlt.dat index fd0b7a667f5..1a709261153 100644 Binary files a/release/datafiles/blender_icons16/icon16_checkbox_dehlt.dat and b/release/datafiles/blender_icons16/icon16_checkbox_dehlt.dat differ diff --git a/release/datafiles/blender_icons16/icon16_constraint_bone.dat b/release/datafiles/blender_icons16/icon16_constraint_bone.dat index ae4880d38f3..2b57d8772f3 100644 Binary files a/release/datafiles/blender_icons16/icon16_constraint_bone.dat and b/release/datafiles/blender_icons16/icon16_constraint_bone.dat differ diff --git a/release/datafiles/blender_icons16/icon16_decorate.dat b/release/datafiles/blender_icons16/icon16_decorate.dat index 0847abef093..bd67c8603bc 100644 Binary files a/release/datafiles/blender_icons16/icon16_decorate.dat and b/release/datafiles/blender_icons16/icon16_decorate.dat differ diff --git a/release/datafiles/blender_icons16/icon16_decorate_driver.dat b/release/datafiles/blender_icons16/icon16_decorate_driver.dat index afbf8a6a5c4..e17c5730ce1 100644 Binary files a/release/datafiles/blender_icons16/icon16_decorate_driver.dat and b/release/datafiles/blender_icons16/icon16_decorate_driver.dat differ diff --git a/release/datafiles/blender_icons16/icon16_decorate_locked.dat b/release/datafiles/blender_icons16/icon16_decorate_locked.dat index 69665837260..e50302b7f73 100644 Binary files a/release/datafiles/blender_icons16/icon16_decorate_locked.dat and b/release/datafiles/blender_icons16/icon16_decorate_locked.dat differ diff --git a/release/datafiles/blender_icons16/icon16_driver_distance.dat b/release/datafiles/blender_icons16/icon16_driver_distance.dat new file mode 100644 index 00000000000..fa5369530b4 Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_driver_distance.dat differ diff --git a/release/datafiles/blender_icons16/icon16_driver_rotational_difference.dat b/release/datafiles/blender_icons16/icon16_driver_rotational_difference.dat new file mode 100644 index 00000000000..a45f392b574 Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_driver_rotational_difference.dat differ diff --git a/release/datafiles/blender_icons16/icon16_driver_transform.dat b/release/datafiles/blender_icons16/icon16_driver_transform.dat new file mode 100644 index 00000000000..f7a4a0a3415 Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_driver_transform.dat differ diff --git a/release/datafiles/blender_icons16/icon16_duplicate.dat b/release/datafiles/blender_icons16/icon16_duplicate.dat new file mode 100644 index 00000000000..5d2a2459882 Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_duplicate.dat differ diff --git a/release/datafiles/blender_icons16/icon16_light_point.dat b/release/datafiles/blender_icons16/icon16_light_point.dat index 3e983da1912..7effd658603 100644 Binary files a/release/datafiles/blender_icons16/icon16_light_point.dat and b/release/datafiles/blender_icons16/icon16_light_point.dat differ diff --git a/release/datafiles/blender_icons16/icon16_longdisplay.dat b/release/datafiles/blender_icons16/icon16_longdisplay.dat index 723ce1e1c52..3e6962caa1f 100644 Binary files a/release/datafiles/blender_icons16/icon16_longdisplay.dat and b/release/datafiles/blender_icons16/icon16_longdisplay.dat differ diff --git a/release/datafiles/blender_icons16/icon16_meta_empty.dat b/release/datafiles/blender_icons16/icon16_meta_empty.dat index d689c037692..d7c94ae8f93 100644 Binary files a/release/datafiles/blender_icons16/icon16_meta_empty.dat and b/release/datafiles/blender_icons16/icon16_meta_empty.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_array.dat b/release/datafiles/blender_icons16/icon16_mod_array.dat index 402e3118c28..0ddf4a6166f 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_array.dat and b/release/datafiles/blender_icons16/icon16_mod_array.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_bevel.dat b/release/datafiles/blender_icons16/icon16_mod_bevel.dat index 9704c012899..fbd732b307a 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_bevel.dat and b/release/datafiles/blender_icons16/icon16_mod_bevel.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_boolean.dat b/release/datafiles/blender_icons16/icon16_mod_boolean.dat index 3c3b534ef3e..8738f50c10d 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_boolean.dat and b/release/datafiles/blender_icons16/icon16_mod_boolean.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_build.dat b/release/datafiles/blender_icons16/icon16_mod_build.dat index 37fd632f2c6..2780ea729a4 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_build.dat and b/release/datafiles/blender_icons16/icon16_mod_build.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_data_transfer.dat b/release/datafiles/blender_icons16/icon16_mod_data_transfer.dat index e76b569fa22..29b3790b068 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_data_transfer.dat and b/release/datafiles/blender_icons16/icon16_mod_data_transfer.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_decim.dat b/release/datafiles/blender_icons16/icon16_mod_decim.dat index 03873e44990..f70eda86e51 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_decim.dat and b/release/datafiles/blender_icons16/icon16_mod_decim.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_edgesplit.dat b/release/datafiles/blender_icons16/icon16_mod_edgesplit.dat index 1b3d015322b..38f57887bfe 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_edgesplit.dat and b/release/datafiles/blender_icons16/icon16_mod_edgesplit.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_normaledit.dat b/release/datafiles/blender_icons16/icon16_mod_normaledit.dat index 840528d36a7..8e6277ee315 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_normaledit.dat and b/release/datafiles/blender_icons16/icon16_mod_normaledit.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_simpledeform.dat b/release/datafiles/blender_icons16/icon16_mod_simpledeform.dat index 7a167d422be..6f1959840d1 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_simpledeform.dat and b/release/datafiles/blender_icons16/icon16_mod_simpledeform.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_smooth.dat b/release/datafiles/blender_icons16/icon16_mod_smooth.dat index c3062057c9b..795dc984e2b 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_smooth.dat and b/release/datafiles/blender_icons16/icon16_mod_smooth.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_solidify.dat b/release/datafiles/blender_icons16/icon16_mod_solidify.dat index 6303fd8acd3..75ac6d73c5a 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_solidify.dat and b/release/datafiles/blender_icons16/icon16_mod_solidify.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_subsurf.dat b/release/datafiles/blender_icons16/icon16_mod_subsurf.dat index 6228aa0c556..74f43a74010 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_subsurf.dat and b/release/datafiles/blender_icons16/icon16_mod_subsurf.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_triangulate.dat b/release/datafiles/blender_icons16/icon16_mod_triangulate.dat index b7ab1b7a5c7..4f5998fe3a6 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_triangulate.dat and b/release/datafiles/blender_icons16/icon16_mod_triangulate.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_uvproject.dat b/release/datafiles/blender_icons16/icon16_mod_uvproject.dat index 409975cc8ed..75b63cb77d2 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_uvproject.dat and b/release/datafiles/blender_icons16/icon16_mod_uvproject.dat differ diff --git a/release/datafiles/blender_icons16/icon16_mod_warp.dat b/release/datafiles/blender_icons16/icon16_mod_warp.dat index 1ed3c1b0fd3..7957c541228 100644 Binary files a/release/datafiles/blender_icons16/icon16_mod_warp.dat and b/release/datafiles/blender_icons16/icon16_mod_warp.dat differ diff --git a/release/datafiles/blender_icons16/icon16_normals_face.dat b/release/datafiles/blender_icons16/icon16_normals_face.dat index c40fa2db137..0964283cffa 100644 Binary files a/release/datafiles/blender_icons16/icon16_normals_face.dat and b/release/datafiles/blender_icons16/icon16_normals_face.dat differ diff --git a/release/datafiles/blender_icons16/icon16_normals_vertex_face.dat b/release/datafiles/blender_icons16/icon16_normals_vertex_face.dat index 0964283cffa..c40fa2db137 100644 Binary files a/release/datafiles/blender_icons16/icon16_normals_vertex_face.dat and b/release/datafiles/blender_icons16/icon16_normals_vertex_face.dat differ diff --git a/release/datafiles/blender_icons16/icon16_onionskin_on.dat b/release/datafiles/blender_icons16/icon16_onionskin_on.dat index 1e44e239a10..f7a6cf28803 100644 Binary files a/release/datafiles/blender_icons16/icon16_onionskin_on.dat and b/release/datafiles/blender_icons16/icon16_onionskin_on.dat differ diff --git a/release/datafiles/blender_icons16/icon16_physics.dat b/release/datafiles/blender_icons16/icon16_physics.dat index d81ef2fa196..9f16b4ece6d 100644 Binary files a/release/datafiles/blender_icons16/icon16_physics.dat and b/release/datafiles/blender_icons16/icon16_physics.dat differ diff --git a/release/datafiles/blender_icons16/icon16_pose_data.dat b/release/datafiles/blender_icons16/icon16_pose_data.dat index 7adbc3fb8f3..b15edbbe82d 100644 Binary files a/release/datafiles/blender_icons16/icon16_pose_data.dat and b/release/datafiles/blender_icons16/icon16_pose_data.dat differ diff --git a/release/datafiles/blender_icons16/icon16_preset_new.dat b/release/datafiles/blender_icons16/icon16_preset_new.dat new file mode 100644 index 00000000000..9df53a293fe Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_preset_new.dat differ diff --git a/release/datafiles/blender_icons16/icon16_radiobut_off.dat b/release/datafiles/blender_icons16/icon16_radiobut_off.dat index 2038d842fa9..45836d102b2 100644 Binary files a/release/datafiles/blender_icons16/icon16_radiobut_off.dat and b/release/datafiles/blender_icons16/icon16_radiobut_off.dat differ diff --git a/release/datafiles/blender_icons16/icon16_restrict_render_on.dat b/release/datafiles/blender_icons16/icon16_restrict_render_on.dat index a3318bbfcab..f62bbd408a5 100644 Binary files a/release/datafiles/blender_icons16/icon16_restrict_render_on.dat and b/release/datafiles/blender_icons16/icon16_restrict_render_on.dat differ diff --git a/release/datafiles/blender_icons16/icon16_rna.dat b/release/datafiles/blender_icons16/icon16_rna.dat index 550f468f623..f38ea452a86 100644 Binary files a/release/datafiles/blender_icons16/icon16_rna.dat and b/release/datafiles/blender_icons16/icon16_rna.dat differ diff --git a/release/datafiles/blender_icons16/icon16_rna_add.dat b/release/datafiles/blender_icons16/icon16_rna_add.dat index d05e73208ac..8a6a5035f80 100644 Binary files a/release/datafiles/blender_icons16/icon16_rna_add.dat and b/release/datafiles/blender_icons16/icon16_rna_add.dat differ diff --git a/release/datafiles/blender_icons16/icon16_shaderfx.dat b/release/datafiles/blender_icons16/icon16_shaderfx.dat index 18686578e6b..9064969f3ed 100644 Binary files a/release/datafiles/blender_icons16/icon16_shaderfx.dat and b/release/datafiles/blender_icons16/icon16_shaderfx.dat differ diff --git a/release/datafiles/blender_icons16/icon16_shortdisplay.dat b/release/datafiles/blender_icons16/icon16_shortdisplay.dat index ae13c1a1622..7d60845079b 100644 Binary files a/release/datafiles/blender_icons16/icon16_shortdisplay.dat and b/release/datafiles/blender_icons16/icon16_shortdisplay.dat differ diff --git a/release/datafiles/blender_icons16/icon16_speaker.dat b/release/datafiles/blender_icons16/icon16_speaker.dat index 0be51511ac9..eb7b8dda707 100644 Binary files a/release/datafiles/blender_icons16/icon16_speaker.dat and b/release/datafiles/blender_icons16/icon16_speaker.dat differ diff --git a/release/datafiles/blender_icons16/icon16_tracking.dat b/release/datafiles/blender_icons16/icon16_tracking.dat index 507d6262e4e..0d8ff23d77e 100644 Binary files a/release/datafiles/blender_icons16/icon16_tracking.dat and b/release/datafiles/blender_icons16/icon16_tracking.dat differ diff --git a/release/datafiles/blender_icons16/icon16_window.dat b/release/datafiles/blender_icons16/icon16_window.dat new file mode 100644 index 00000000000..1b280f200a2 Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_window.dat differ diff --git a/release/datafiles/blender_icons32/icon32_checkbox_dehlt.dat b/release/datafiles/blender_icons32/icon32_checkbox_dehlt.dat index cdb64664cb8..c7aab87c591 100644 Binary files a/release/datafiles/blender_icons32/icon32_checkbox_dehlt.dat and b/release/datafiles/blender_icons32/icon32_checkbox_dehlt.dat differ diff --git a/release/datafiles/blender_icons32/icon32_decorate.dat b/release/datafiles/blender_icons32/icon32_decorate.dat index 1ee25791fcb..b40a74ae3f0 100644 Binary files a/release/datafiles/blender_icons32/icon32_decorate.dat and b/release/datafiles/blender_icons32/icon32_decorate.dat differ diff --git a/release/datafiles/blender_icons32/icon32_decorate_driver.dat b/release/datafiles/blender_icons32/icon32_decorate_driver.dat index ddd69500e13..e9eb3d04f80 100644 Binary files a/release/datafiles/blender_icons32/icon32_decorate_driver.dat and b/release/datafiles/blender_icons32/icon32_decorate_driver.dat differ diff --git a/release/datafiles/blender_icons32/icon32_driver_distance.dat b/release/datafiles/blender_icons32/icon32_driver_distance.dat new file mode 100644 index 00000000000..14a1dfd40ff Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_driver_distance.dat differ diff --git a/release/datafiles/blender_icons32/icon32_driver_rotational_difference.dat b/release/datafiles/blender_icons32/icon32_driver_rotational_difference.dat new file mode 100644 index 00000000000..ac9006cc4a2 Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_driver_rotational_difference.dat differ diff --git a/release/datafiles/blender_icons32/icon32_driver_transform.dat b/release/datafiles/blender_icons32/icon32_driver_transform.dat new file mode 100644 index 00000000000..947a1f8d73d Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_driver_transform.dat differ diff --git a/release/datafiles/blender_icons32/icon32_duplicate.dat b/release/datafiles/blender_icons32/icon32_duplicate.dat new file mode 100644 index 00000000000..3060365c3d7 Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_duplicate.dat differ diff --git a/release/datafiles/blender_icons32/icon32_light_point.dat b/release/datafiles/blender_icons32/icon32_light_point.dat index 7ff1e834f1e..82e72b5c7cd 100644 Binary files a/release/datafiles/blender_icons32/icon32_light_point.dat and b/release/datafiles/blender_icons32/icon32_light_point.dat differ diff --git a/release/datafiles/blender_icons32/icon32_longdisplay.dat b/release/datafiles/blender_icons32/icon32_longdisplay.dat index d106fe9ccfd..28ab9f7a225 100644 Binary files a/release/datafiles/blender_icons32/icon32_longdisplay.dat and b/release/datafiles/blender_icons32/icon32_longdisplay.dat differ diff --git a/release/datafiles/blender_icons32/icon32_meta_empty.dat b/release/datafiles/blender_icons32/icon32_meta_empty.dat index ed2eff7c13c..9bbf02a57a3 100644 Binary files a/release/datafiles/blender_icons32/icon32_meta_empty.dat and b/release/datafiles/blender_icons32/icon32_meta_empty.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_array.dat b/release/datafiles/blender_icons32/icon32_mod_array.dat index 4e70ee382a5..2436cdf69c7 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_array.dat and b/release/datafiles/blender_icons32/icon32_mod_array.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_bevel.dat b/release/datafiles/blender_icons32/icon32_mod_bevel.dat index 329fb601ba5..e9839b72901 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_bevel.dat and b/release/datafiles/blender_icons32/icon32_mod_bevel.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_boolean.dat b/release/datafiles/blender_icons32/icon32_mod_boolean.dat index 0471b4e0556..348780f970b 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_boolean.dat and b/release/datafiles/blender_icons32/icon32_mod_boolean.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_build.dat b/release/datafiles/blender_icons32/icon32_mod_build.dat index 2437666f482..72c28c34790 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_build.dat and b/release/datafiles/blender_icons32/icon32_mod_build.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_data_transfer.dat b/release/datafiles/blender_icons32/icon32_mod_data_transfer.dat index 0a2ece12cc6..beebedef335 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_data_transfer.dat and b/release/datafiles/blender_icons32/icon32_mod_data_transfer.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_decim.dat b/release/datafiles/blender_icons32/icon32_mod_decim.dat index 719bd5b0bab..59e5056a5df 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_decim.dat and b/release/datafiles/blender_icons32/icon32_mod_decim.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_edgesplit.dat b/release/datafiles/blender_icons32/icon32_mod_edgesplit.dat index 7f459d4edac..c22feab630b 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_edgesplit.dat and b/release/datafiles/blender_icons32/icon32_mod_edgesplit.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_normaledit.dat b/release/datafiles/blender_icons32/icon32_mod_normaledit.dat index a06ede735da..308a62d1409 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_normaledit.dat and b/release/datafiles/blender_icons32/icon32_mod_normaledit.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_simpledeform.dat b/release/datafiles/blender_icons32/icon32_mod_simpledeform.dat index 1f90916e327..30c306f19b1 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_simpledeform.dat and b/release/datafiles/blender_icons32/icon32_mod_simpledeform.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_smooth.dat b/release/datafiles/blender_icons32/icon32_mod_smooth.dat index ed99bf554e7..d9f339ecaaa 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_smooth.dat and b/release/datafiles/blender_icons32/icon32_mod_smooth.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_solidify.dat b/release/datafiles/blender_icons32/icon32_mod_solidify.dat index dd00d2968e3..8064c19c785 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_solidify.dat and b/release/datafiles/blender_icons32/icon32_mod_solidify.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_subsurf.dat b/release/datafiles/blender_icons32/icon32_mod_subsurf.dat index 2f9f2d30726..242209309c4 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_subsurf.dat and b/release/datafiles/blender_icons32/icon32_mod_subsurf.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_triangulate.dat b/release/datafiles/blender_icons32/icon32_mod_triangulate.dat index df0e6fd7a23..80f0017bc08 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_triangulate.dat and b/release/datafiles/blender_icons32/icon32_mod_triangulate.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_uvproject.dat b/release/datafiles/blender_icons32/icon32_mod_uvproject.dat index f129c96a194..d0e94cfec5f 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_uvproject.dat and b/release/datafiles/blender_icons32/icon32_mod_uvproject.dat differ diff --git a/release/datafiles/blender_icons32/icon32_mod_warp.dat b/release/datafiles/blender_icons32/icon32_mod_warp.dat index 3bd7d3153d2..437a615d432 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_warp.dat and b/release/datafiles/blender_icons32/icon32_mod_warp.dat differ diff --git a/release/datafiles/blender_icons32/icon32_normals_face.dat b/release/datafiles/blender_icons32/icon32_normals_face.dat index 1f14a644d08..761a44cc728 100644 Binary files a/release/datafiles/blender_icons32/icon32_normals_face.dat and b/release/datafiles/blender_icons32/icon32_normals_face.dat differ diff --git a/release/datafiles/blender_icons32/icon32_normals_vertex_face.dat b/release/datafiles/blender_icons32/icon32_normals_vertex_face.dat index 761a44cc728..1f14a644d08 100644 Binary files a/release/datafiles/blender_icons32/icon32_normals_vertex_face.dat and b/release/datafiles/blender_icons32/icon32_normals_vertex_face.dat differ diff --git a/release/datafiles/blender_icons32/icon32_physics.dat b/release/datafiles/blender_icons32/icon32_physics.dat index 939284b7c91..e9c5072cc57 100644 Binary files a/release/datafiles/blender_icons32/icon32_physics.dat and b/release/datafiles/blender_icons32/icon32_physics.dat differ diff --git a/release/datafiles/blender_icons32/icon32_pose_data.dat b/release/datafiles/blender_icons32/icon32_pose_data.dat index 941db6233ee..71e34c96345 100644 Binary files a/release/datafiles/blender_icons32/icon32_pose_data.dat and b/release/datafiles/blender_icons32/icon32_pose_data.dat differ diff --git a/release/datafiles/blender_icons32/icon32_preset_new.dat b/release/datafiles/blender_icons32/icon32_preset_new.dat new file mode 100644 index 00000000000..ed3190329a6 Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_preset_new.dat differ diff --git a/release/datafiles/blender_icons32/icon32_radiobut_off.dat b/release/datafiles/blender_icons32/icon32_radiobut_off.dat index 1c013d99d5d..2f41c8430ad 100644 Binary files a/release/datafiles/blender_icons32/icon32_radiobut_off.dat and b/release/datafiles/blender_icons32/icon32_radiobut_off.dat differ diff --git a/release/datafiles/blender_icons32/icon32_rna.dat b/release/datafiles/blender_icons32/icon32_rna.dat index 165e34edcdd..9f3db375f18 100644 Binary files a/release/datafiles/blender_icons32/icon32_rna.dat and b/release/datafiles/blender_icons32/icon32_rna.dat differ diff --git a/release/datafiles/blender_icons32/icon32_rna_add.dat b/release/datafiles/blender_icons32/icon32_rna_add.dat index 354c2e5f35e..44894ccbcd0 100644 Binary files a/release/datafiles/blender_icons32/icon32_rna_add.dat and b/release/datafiles/blender_icons32/icon32_rna_add.dat differ diff --git a/release/datafiles/blender_icons32/icon32_shaderfx.dat b/release/datafiles/blender_icons32/icon32_shaderfx.dat index 8a479ec92ed..b58ce86761e 100644 Binary files a/release/datafiles/blender_icons32/icon32_shaderfx.dat and b/release/datafiles/blender_icons32/icon32_shaderfx.dat differ diff --git a/release/datafiles/blender_icons32/icon32_shortdisplay.dat b/release/datafiles/blender_icons32/icon32_shortdisplay.dat index c0808177766..b5c9e9e6d07 100644 Binary files a/release/datafiles/blender_icons32/icon32_shortdisplay.dat and b/release/datafiles/blender_icons32/icon32_shortdisplay.dat differ diff --git a/release/datafiles/blender_icons32/icon32_speaker.dat b/release/datafiles/blender_icons32/icon32_speaker.dat index 64981d5de12..970f525c1c8 100644 Binary files a/release/datafiles/blender_icons32/icon32_speaker.dat and b/release/datafiles/blender_icons32/icon32_speaker.dat differ diff --git a/release/datafiles/blender_icons32/icon32_tracking.dat b/release/datafiles/blender_icons32/icon32_tracking.dat index 999716700f9..0a7e4ca544e 100644 Binary files a/release/datafiles/blender_icons32/icon32_tracking.dat and b/release/datafiles/blender_icons32/icon32_tracking.dat differ diff --git a/release/datafiles/blender_icons32/icon32_window.dat b/release/datafiles/blender_icons32/icon32_window.dat new file mode 100644 index 00000000000..880bbe7f6c0 Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_window.dat differ diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index eb92f0f8723..3d97039c8cb 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -30,7 +30,7 @@ class MESH_MT_vertex_group_specials(Menu): layout.operator("object.vertex_group_sort", icon='SORTALPHA', text="Sort by Name").sort_type = 'NAME' layout.operator("object.vertex_group_sort", icon='ARMATURE_DATA', text="Sort by Bone Hierarchy").sort_type = 'BONE_HIERARCHY' - layout.operator("object.vertex_group_copy", icon='ADD') + layout.operator("object.vertex_group_copy", icon='DUPLICATE') layout.operator("object.vertex_group_copy_to_linked", icon='LINKED') layout.operator("object.vertex_group_copy_to_selected", icon='RESTRICT_SELECT_ON') layout.operator("object.vertex_group_mirror", icon='ARROW_LEFTRIGHT').use_topology = False diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index cde88e13b1f..34ce9bd1fbe 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -71,7 +71,7 @@ DEF_ICON(GRIP) DEF_ICON(DOT) DEF_ICON(COLLAPSEMENU) DEF_ICON(X) -DEF_ICON_BLANK(74) +DEF_ICON(DUPLICATE) DEF_ICON_BLANK(75) DEF_ICON_BLANK(76) DEF_ICON_BLANK(77) @@ -79,7 +79,7 @@ DEF_ICON(NODE) DEF_ICON(NODE_SEL) /* ui */ -DEF_ICON_BLANK(FULLSCREEN) +DEF_ICON(WINDOW) DEF_ICON(WORKSPACE) DEF_ICON(RIGHTARROW_THIN) DEF_ICON(BORDERMOVE) @@ -87,7 +87,7 @@ DEF_ICON(VIEWZOOM) DEF_ICON(ADD) DEF_ICON(REMOVE) DEF_ICON(PANEL_CLOSE) -DEF_ICON_COLOR(COPY_ID) +DEF_ICON(COPY_ID) DEF_ICON(EYEDROPPER) DEF_ICON_BLANK(92) DEF_ICON(AUTO) @@ -118,9 +118,9 @@ DEF_ICON(ZOOM_SELECTED) DEF_ICON(ZOOM_PREVIOUS) DEF_ICON(ZOOM_IN) DEF_ICON(ZOOM_OUT) -DEF_ICON_BLANK(121) -DEF_ICON_BLANK(122) -DEF_ICON_BLANK(123) +DEF_ICON(DRIVER_DISTANCE) +DEF_ICON(DRIVER_ROTATIONAL_DIFFERENCE) +DEF_ICON(DRIVER_TRANSFORM) DEF_ICON(FREEZE) DEF_ICON(STYLUS_PRESSURE) DEF_ICON(GHOST_DISABLED) @@ -282,7 +282,7 @@ DEF_ICON(MOUSE_LMB_DRAG) DEF_ICON(MOUSE_MMB_DRAG) DEF_ICON(MOUSE_RMB_DRAG) DEF_ICON_BLANK(284) -DEF_ICON_BLANK(285) +DEF_ICON(PRESET_NEW) DEF_ICON_BLANK(286) DEF_ICON(DECORATE) DEF_ICON(DECORATE_KEYFRAME) @@ -718,8 +718,8 @@ DEF_ICON_BLANK(243) DEF_ICON_BLANK(244) DEF_ICON_BLANK(245) DEF_ICON(NORMALS_VERTEX) -DEF_ICON(NORMALS_VERTEX_FACE) DEF_ICON(NORMALS_FACE) +DEF_ICON(NORMALS_VERTEX_FACE) /* 3D VIEW */ DEF_ICON(SHADING_BBOX) diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 7acbb0633b5..0ed835bac19 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -623,13 +623,13 @@ static uiBut *template_id_def_new_but( if (newop) { but = uiDefIconTextButO( - block, but_type, newop, WM_OP_INVOKE_DEFAULT, ICON_ADD, + block, but_type, newop, WM_OP_INVOKE_DEFAULT, (id) ? ICON_DUPLICATE : ICON_ADD, (id) ? "" : CTX_IFACE_(template_id_context(type), "New"), 0, 0, w, but_height, NULL); UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), POINTER_FROM_INT(UI_ID_ADD_NEW)); } else { but = uiDefIconTextBut( - block, but_type, 0, ICON_ADD, (id) ? "" : CTX_IFACE_(template_id_context(type), "New"), + block, but_type, 0, (id) ? ICON_DUPLICATE : ICON_ADD, (id) ? "" : CTX_IFACE_(template_id_context(type), "New"), 0, 0, w, but_height, NULL, 0, 0, 0, 0, NULL); UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), POINTER_FROM_INT(UI_ID_ADD_NEW)); } diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index ba8522199c6..19af0371373 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1075,7 +1075,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) data.icon = ICON_MOD_MASK; break; case eGpencilModifierType_Color: - data.icon = ICON_MOD_TINT; + data.icon = ICON_MOD_HUE_SATURATION; break; case eGpencilModifierType_Lattice: data.icon = ICON_MOD_LATTICE; diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 06dfff231d3..eeb9713b1d4 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -82,7 +82,7 @@ const EnumPropertyItem rna_enum_id_type_items[] = { {ID_SPK, "SPEAKER", ICON_SPEAKER, "Speaker", ""}, {ID_TXT, "TEXT", ICON_TEXT, "Text", ""}, {ID_TE, "TEXTURE", ICON_TEXTURE_DATA, "Texture", ""}, - {ID_WM, "WINDOWMANAGER", ICON_WORKSPACE, "Window Manager", ""}, + {ID_WM, "WINDOWMANAGER", ICON_WINDOW, "Window Manager", ""}, {ID_WO, "WORLD", ICON_WORLD_DATA, "World", ""}, {ID_WS, "WORKSPACE", ICON_WORKSPACE, "Workspace", ""}, {0, NULL, 0, NULL, NULL} diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 01435bce0e3..7b714bef186 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -1554,10 +1554,10 @@ static void rna_def_drivervar(BlenderRNA *brna) static const EnumPropertyItem prop_type_items[] = { {DVAR_TYPE_SINGLE_PROP, "SINGLE_PROP", ICON_RNA, "Single Property", "Use the value from some RNA property (Default)"}, - {DVAR_TYPE_TRANSFORM_CHAN, "TRANSFORMS", ICON_ORIENTATION_GLOBAL, "Transform Channel", + {DVAR_TYPE_TRANSFORM_CHAN, "TRANSFORMS", ICON_DRIVER_TRANSFORM, "Transform Channel", "Final transformation value of object or bone"}, - {DVAR_TYPE_ROT_DIFF, "ROTATION_DIFF", ICON_PARTICLE_TIP, "Rotational Difference", "Use the angle between two bones"}, /* XXX: Icon... */ - {DVAR_TYPE_LOC_DIFF, "LOC_DIFF", ICON_FULLSCREEN_ENTER, "Distance", "Distance between two bones or objects"}, /* XXX: Icon... */ + {DVAR_TYPE_ROT_DIFF, "ROTATION_DIFF", ICON_DRIVER_ROTATIONAL_DIFFERENCE, "Rotational Difference", "Use the angle between two bones"}, + {DVAR_TYPE_LOC_DIFF, "LOC_DIFF", ICON_DRIVER_DISTANCE, "Distance", "Distance between two bones or objects"}, {0, NULL, 0, NULL, NULL} }; diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index e7dee4f2c83..37b93339ee7 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -76,7 +76,7 @@ const EnumPropertyItem rna_enum_object_greasepencil_modifier_type_items[] = { {eGpencilModifierType_Thick, "GP_THICK", ICON_MOD_THICKNESS, "Thickness", "Change stroke thickness"}, {eGpencilModifierType_Time, "GP_TIME", ICON_MOD_TIME, "Time Offset", "Offset keyframes"}, {0, "", 0, N_("Color"), "" }, - {eGpencilModifierType_Color, "GP_COLOR", ICON_MOD_TINT, "Hue/Saturation", "Apply changes to stroke colors"}, + {eGpencilModifierType_Color, "GP_COLOR", ICON_MOD_HUE_SATURATION, "Hue/Saturation", "Apply changes to stroke colors"}, {eGpencilModifierType_Opacity, "GP_OPACITY", ICON_MOD_OPACITY, "Opacity", "Opacity of the strokes"}, {eGpencilModifierType_Tint, "GP_TINT", ICON_MOD_TINT, "Tint", "Tint strokes with new color"}, {0, NULL, 0, NULL, NULL}