diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index 16d50623fa4..6fa54c25de2 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -3209,6 +3209,7 @@ + diff --git a/release/datafiles/blender_icons16/icon16_brush_blob.dat b/release/datafiles/blender_icons16/icon16_brush_blob.dat deleted file mode 100644 index 4f57ce5ef27..00000000000 Binary files a/release/datafiles/blender_icons16/icon16_brush_blob.dat and /dev/null differ diff --git a/release/datafiles/blender_icons16/icon16_clip.dat b/release/datafiles/blender_icons16/icon16_clip.dat deleted file mode 100644 index 75a39fc0bdf..00000000000 Binary files a/release/datafiles/blender_icons16/icon16_clip.dat and /dev/null 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 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_sculpt_dyntopo.dat b/release/datafiles/blender_icons16/icon16_sculpt_dyntopo.dat deleted file mode 100644 index 08fc3aba73c..00000000000 Binary files a/release/datafiles/blender_icons16/icon16_sculpt_dyntopo.dat and /dev/null differ diff --git a/release/datafiles/blender_icons16/icon16_sealed.dat b/release/datafiles/blender_icons16/icon16_sealed.dat deleted file mode 100644 index 2c6e3bac48f..00000000000 Binary files a/release/datafiles/blender_icons16/icon16_sealed.dat and /dev/null differ diff --git a/release/datafiles/blender_icons16/icon16_temp.dat b/release/datafiles/blender_icons16/icon16_temp.dat index 0c3a0bd5deb..9abd6ac2a0d 100644 Binary files a/release/datafiles/blender_icons16/icon16_temp.dat and b/release/datafiles/blender_icons16/icon16_temp.dat differ diff --git a/release/datafiles/blender_icons32/icon32_axis_front.dat b/release/datafiles/blender_icons32/icon32_axis_front.dat index afcc15da233..ca9a0efd467 100644 Binary files a/release/datafiles/blender_icons32/icon32_axis_front.dat and b/release/datafiles/blender_icons32/icon32_axis_front.dat differ diff --git a/release/datafiles/blender_icons32/icon32_brush_blob.dat b/release/datafiles/blender_icons32/icon32_brush_blob.dat deleted file mode 100644 index 5f43c0e3943..00000000000 Binary files a/release/datafiles/blender_icons32/icon32_brush_blob.dat and /dev/null differ diff --git a/release/datafiles/blender_icons32/icon32_clip.dat b/release/datafiles/blender_icons32/icon32_clip.dat deleted file mode 100644 index 00fec392e77..00000000000 Binary files a/release/datafiles/blender_icons32/icon32_clip.dat and /dev/null 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 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_mod_offset.dat b/release/datafiles/blender_icons32/icon32_mod_offset.dat index 232c79c0c59..eb767471c25 100644 Binary files a/release/datafiles/blender_icons32/icon32_mod_offset.dat and b/release/datafiles/blender_icons32/icon32_mod_offset.dat differ diff --git a/release/datafiles/blender_icons32/icon32_sculpt_dyntopo.dat b/release/datafiles/blender_icons32/icon32_sculpt_dyntopo.dat deleted file mode 100644 index 41e3c0c4fcc..00000000000 Binary files a/release/datafiles/blender_icons32/icon32_sculpt_dyntopo.dat and /dev/null differ diff --git a/release/datafiles/blender_icons32/icon32_sealed.dat b/release/datafiles/blender_icons32/icon32_sealed.dat deleted file mode 100644 index 37d48608be2..00000000000 Binary files a/release/datafiles/blender_icons32/icon32_sealed.dat and /dev/null differ diff --git a/release/datafiles/blender_icons32/icon32_temp.dat b/release/datafiles/blender_icons32/icon32_temp.dat index 645206e8560..74f6401712c 100644 Binary files a/release/datafiles/blender_icons32/icon32_temp.dat and b/release/datafiles/blender_icons32/icon32_temp.dat differ diff --git a/release/datafiles/locale b/release/datafiles/locale index 6c693b5b0b2..aafea2abb18 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit 6c693b5b0b27468d4fd2d2c47ea023eebbb0dbc0 +Subproject commit aafea2abb18bb42e7d31a6926b2caba90f4e0316 diff --git a/release/datafiles/prvicons.png b/release/datafiles/prvicons.png index 4b7b23aa006..e97e2ae330e 100644 Binary files a/release/datafiles/prvicons.png and b/release/datafiles/prvicons.png differ diff --git a/release/scripts/addons b/release/scripts/addons index f01d08b7c5f..37af7e130b9 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit f01d08b7c5f7873e0ce8a77b84788e2f6b1ad716 +Subproject commit 37af7e130b99865575f1fa2315ef806f815b0f42 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index d71985e9019..a140f066ac9 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit d71985e901986970dfc86c3d5d1124d0f8c27518 +Subproject commit a140f066ac99e1860af38080f008507029a34706 diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index bd37df49e39..4c0d1b65465 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -53,6 +53,9 @@ set(ICON_NAMES collapsemenu x duplicate + trash + collection_new + options node node_sel window @@ -65,6 +68,7 @@ set(ICON_NAMES panel_close copy_id eyedropper + checkmark auto checkbox_dehlt checkbox_hlt @@ -75,6 +79,10 @@ set(ICON_NAMES screen_back rightarrow downarrow_hlt + fcurve_snapshot + object_hidden + topbar + statusbar plugin help ghost_enabled @@ -101,6 +109,7 @@ set(ICON_NAMES three_dots fullscreen_enter fullscreen_exit + brushes_all light material texture @@ -132,7 +141,7 @@ set(ICON_NAMES time nodetree console - clip + tracker asset_manager node_compositing node_texture @@ -140,6 +149,7 @@ set(ICON_NAMES object_datamode editmode_hlt uv + uv_data vpaint_hlt tpaint_hlt wpaint_hlt @@ -213,6 +223,7 @@ set(ICON_NAMES mouse_lmb_drag mouse_mmb_drag mouse_rmb_drag + memory preset_new decorate decorate_keyframe @@ -223,7 +234,8 @@ set(ICON_NAMES decorate_unlocked decorate_locked decorate_override - sealed + fund + tracker_data heart orphan_data user @@ -245,6 +257,7 @@ set(ICON_NAMES outliner_ob_greasepencil outliner_ob_lightprobe outliner_ob_image + outliner_collection restrict_color_off restrict_color_on hide_on @@ -253,6 +266,7 @@ set(ICON_NAMES restrict_select_off restrict_render_on restrict_render_off + restrict_instanced_off outliner_data_empty outliner_data_mesh outliner_data_curve @@ -264,17 +278,21 @@ set(ICON_NAMES outliner_data_font outliner_data_surface outliner_data_speaker + outliner_data_lightprobe + outliner_data_gp_layer outliner_data_greasepencil gp_select_points gp_select_strokes gp_multiframe_editing gp_only_selected + gp_select_between_strokes modifier_off modifier_on onionskin_off onionskin_on restrict_view_on restrict_view_off + restrict_instanced_on mesh_plane mesh_cube mesh_circle @@ -337,6 +355,8 @@ set(ICON_NAMES force_turbulence force_drag force_fluidflow + rigid_body + rigid_body_constraint image_plane image_background image_reference @@ -345,6 +365,16 @@ set(ICON_NAMES node_top node_side node_corner + anchor_top + anchor_bottom + anchor_left + anchor_right + anchor_center + select_set + select_extend + select_subtract + select_intersect + select_difference align_left align_center align_right @@ -358,6 +388,38 @@ set(ICON_NAMES underline small_caps modifier + con_action + holdout_off + holdout_on + indirect_only_off + indirect_only_on + con_camerasolver + con_followtrack + con_objectsolver + con_loclike + con_rotlike + con_sizelike + con_translike + con_distlimit + con_loclimit + con_rotlimit + con_sizelimit + con_samevol + con_transform + con_transform_cache + con_clampto + con_kinematic + con_locktrack + con_splineik + con_stretchto + con_trackto + con_armature + con_childof + con_floor + con_followpath + con_pivot + con_shrinkwrap + modifier_data mod_wave mod_build mod_decim @@ -385,6 +447,7 @@ set(ICON_NAMES mod_mask mod_cloth mod_explode + mod_fluidsim mod_multires mod_fluid mod_solidify @@ -415,6 +478,7 @@ set(ICON_NAMES pause prev_keyframe next_keyframe + play_sound play_reverse preview_range action_tweak @@ -456,6 +520,7 @@ set(ICON_NAMES vertexsel edgesel facesel + cursor pivot_boundbox pivot_cursor pivot_individual @@ -464,6 +529,7 @@ set(ICON_NAMES center_only smoothcurve spherecurve + inversesquarecurve rootcurve sharpcurve lincurve @@ -472,10 +538,13 @@ set(ICON_NAMES prop_off prop_on prop_con - sculpt_dyntopo + prop_projected particle_point particle_tip particle_path + snap_face_center + snap_perpendicular + snap_midpoint snap_off snap_on snap_normal @@ -513,6 +582,9 @@ set(ICON_NAMES uv_facesel uv_islandsel uv_sync_select + transform_origins + gizmo + orientation_cursor normals_vertex normals_face normals_vertex_face @@ -530,6 +602,18 @@ set(ICON_NAMES axis_top layer_used layer_active + outliner_ob_hair + outliner_data_hair + hair_data + outliner_ob_pointcloud + outliner_data_pointcloud + pointcloud_data + outliner_ob_volume + outliner_data_volume + volume_data + home + documents + temp sortalpha sortbyext sorttime @@ -541,6 +625,7 @@ set(ICON_NAMES fontpreview filter newfolder + folder_redirect file_parent file_refresh file_folder @@ -562,6 +647,7 @@ set(ICON_NAMES loop_forwards back forward + file_archive file_cache file_volume file_3d @@ -586,16 +672,27 @@ set(ICON_NAMES linenumbers_off linenumbers_on scriptplugins + disc + desktop + external_drive + network_drive seq_sequencer seq_preview seq_luma_waveform seq_chroma_scope seq_histogram seq_splitview + seq_strip_meta + seq_strip_duplicate image_rgb image_rgb_alpha image_alpha image_zdepth + handle_autoclamped + handle_auto + handle_aligned + handle_vector + handle_free view_perspective view_ortho view_camera diff --git a/source/tools b/source/tools index 2afbb8ec472..42a86b05869 160000 --- a/source/tools +++ b/source/tools @@ -1 +1 @@ -Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685 +Subproject commit 42a86b05869c464c87185be378e668b4a9abec8b