diff options
author | Yevgeny Makarov <jenkm> | 2021-02-23 13:37:12 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2021-02-23 14:07:25 +0300 |
commit | 420f538fadfdd7f9713db9aea44cd7829cbc2ef4 (patch) | |
tree | 78f6298e5dcdcb151940e10a06a4d5b4c3d46efe | |
parent | aa4882506c9acb5483b506c5e1d1569ca8cf5dd3 (diff) |
Fix T84707: Wrong icon for Movie Clip Editor
Sync the list of icons in CMakeLists.txt with UI_icons.h.
Restore, in the source file, the FUND icon that was accidentally
deleted.
Delete four old/unused icons.
See also D9715.
21 files changed, 101 insertions, 3 deletions
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 @@ <g id="g6666-5" transform="translate(-63.000002,42.000005)" style="display:inline;opacity:1;fill:#ffffff;enable-background:new" inkscape:export-filename="C:\Users\Andrzej Ambroż\Desktop\mtrx.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96"> <path style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.79999995;marker:none;enable-background:accumulate" d="m 363.5,536 a 0.50005,0.50005 0 0 0 -0.5,0.5 v 13 a 0.50005,0.50005 0 0 0 0.5,0.5 h 13 a 0.50005,0.50005 0 0 0 0.5,-0.5 v -13 a 0.50005,0.50005 0 0 0 -0.5,-0.5 z m 0.5,1 h 12 v 12 h -12 z m 2,2 v 1 h 1 v -1 z m 1,1 v 1 h 1 v -1 z m 1,1 v 1 h 1 v -1 z m 0,1 h -1 v 1 h 1 z m -1,1 h -1 v 1 h 1 z m 2,0 v 1 h 3 v -1 z" transform="translate(63.000002,-42.000005)" id="rect40533-7-0" inkscape:connector-curvature="0"/> </g> + <path inkscape:connector-curvature="0" id="path4106" d="m 408.48148,452.0625 c -1.71014,0.0728 -3.32227,1.4838 -3.32227,3.9375 0,2.05278 1.07076,4.01178 2.38672,5.71289 1.31595,1.70111 2.90024,3.15481 4.03125,4.16016 0.0914,0.0816 0.20954,0.12673 0.33203,0.12695 h 0.5 c 0.12249,-2.2e-4 0.24064,-0.0454 0.33203,-0.12695 1.13101,-1.00535 2.7153,-2.45905 4.03125,-4.16016 1.31596,-1.70111 2.38672,-3.66011 2.38672,-5.71289 0,-2.4537 -1.61213,-3.86473 -3.32227,-3.9375 -1.52139,-0.0647 -3.0532,0.927 -3.67773,2.69727 -0.62453,-1.77027 -2.15634,-2.76201 -3.67773,-2.69727 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" sodipodi:nodetypes="csccccccsccc" /> <g transform="matrix(-1,0,0,1,635,-357)" id="g12824" style="fill:#ffffff"> <path inkscape:connector-curvature="0" id="path12813" d="m 363.5,431 a 0.50005,0.50005 0 0 0 -0.5,0.5 v 1 a 0.50005,0.50005 0 0 0 0.14648,0.35352 L 368,437.70703 V 441.5 a 0.50005,0.50005 0 0 0 0.14648,0.35352 l 3,3 A 0.50005,0.50005 0 0 0 372,444.5 v -6.79297 l 4.85352,-4.85351 A 0.50005,0.50005 0 0 0 377,432.5 v -1 a 0.50005,0.50005 0 0 0 -0.5,-0.5 z m 0.5,1 h 12 v 0.29297 l -4.85352,4.85351 A 0.50005,0.50005 0 0 0 371,437.5 v 5.79297 l -2,-2 V 437.5 a 0.50005,0.50005 0 0 0 -0.14648,-0.35352 L 364,432.29297 Z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"/> </g> diff --git a/release/datafiles/blender_icons16/icon16_brush_blob.dat b/release/datafiles/blender_icons16/icon16_brush_blob.dat Binary files differdeleted file mode 100644 index 4f57ce5ef27..00000000000 --- a/release/datafiles/blender_icons16/icon16_brush_blob.dat +++ /dev/null diff --git a/release/datafiles/blender_icons16/icon16_clip.dat b/release/datafiles/blender_icons16/icon16_clip.dat Binary files differdeleted file mode 100644 index 75a39fc0bdf..00000000000 --- a/release/datafiles/blender_icons16/icon16_clip.dat +++ /dev/null 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_sculpt_dyntopo.dat b/release/datafiles/blender_icons16/icon16_sculpt_dyntopo.dat Binary files differdeleted file mode 100644 index 08fc3aba73c..00000000000 --- a/release/datafiles/blender_icons16/icon16_sculpt_dyntopo.dat +++ /dev/null diff --git a/release/datafiles/blender_icons16/icon16_sealed.dat b/release/datafiles/blender_icons16/icon16_sealed.dat Binary files differdeleted file mode 100644 index 2c6e3bac48f..00000000000 --- a/release/datafiles/blender_icons16/icon16_sealed.dat +++ /dev/null diff --git a/release/datafiles/blender_icons16/icon16_temp.dat b/release/datafiles/blender_icons16/icon16_temp.dat Binary files differindex 0c3a0bd5deb..9abd6ac2a0d 100644 --- a/release/datafiles/blender_icons16/icon16_temp.dat +++ b/release/datafiles/blender_icons16/icon16_temp.dat diff --git a/release/datafiles/blender_icons32/icon32_axis_front.dat b/release/datafiles/blender_icons32/icon32_axis_front.dat Binary files differindex afcc15da233..ca9a0efd467 100644 --- a/release/datafiles/blender_icons32/icon32_axis_front.dat +++ b/release/datafiles/blender_icons32/icon32_axis_front.dat diff --git a/release/datafiles/blender_icons32/icon32_brush_blob.dat b/release/datafiles/blender_icons32/icon32_brush_blob.dat Binary files differdeleted file mode 100644 index 5f43c0e3943..00000000000 --- a/release/datafiles/blender_icons32/icon32_brush_blob.dat +++ /dev/null diff --git a/release/datafiles/blender_icons32/icon32_clip.dat b/release/datafiles/blender_icons32/icon32_clip.dat Binary files differdeleted file mode 100644 index 00fec392e77..00000000000 --- a/release/datafiles/blender_icons32/icon32_clip.dat +++ /dev/null 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_mod_offset.dat b/release/datafiles/blender_icons32/icon32_mod_offset.dat Binary files differindex 232c79c0c59..eb767471c25 100644 --- a/release/datafiles/blender_icons32/icon32_mod_offset.dat +++ b/release/datafiles/blender_icons32/icon32_mod_offset.dat diff --git a/release/datafiles/blender_icons32/icon32_sculpt_dyntopo.dat b/release/datafiles/blender_icons32/icon32_sculpt_dyntopo.dat Binary files differdeleted file mode 100644 index 41e3c0c4fcc..00000000000 --- a/release/datafiles/blender_icons32/icon32_sculpt_dyntopo.dat +++ /dev/null diff --git a/release/datafiles/blender_icons32/icon32_sealed.dat b/release/datafiles/blender_icons32/icon32_sealed.dat Binary files differdeleted file mode 100644 index 37d48608be2..00000000000 --- a/release/datafiles/blender_icons32/icon32_sealed.dat +++ /dev/null diff --git a/release/datafiles/blender_icons32/icon32_temp.dat b/release/datafiles/blender_icons32/icon32_temp.dat Binary files differindex 645206e8560..74f6401712c 100644 --- a/release/datafiles/blender_icons32/icon32_temp.dat +++ b/release/datafiles/blender_icons32/icon32_temp.dat diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject 6c693b5b0b27468d4fd2d2c47ea023eebbb0dbc +Subproject aafea2abb18bb42e7d31a6926b2caba90f4e031 diff --git a/release/datafiles/prvicons.png b/release/datafiles/prvicons.png Binary files differindex 4b7b23aa006..e97e2ae330e 100644 --- a/release/datafiles/prvicons.png +++ b/release/datafiles/prvicons.png diff --git a/release/scripts/addons b/release/scripts/addons -Subproject f01d08b7c5f7873e0ce8a77b84788e2f6b1ad71 +Subproject 37af7e130b99865575f1fa2315ef806f815b0f4 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject d71985e901986970dfc86c3d5d1124d0f8c2751 +Subproject a140f066ac99e1860af38080f008507029a3470 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 -Subproject 2afbb8ec472cac5102eb239f57b006f8c938768 +Subproject 42a86b05869c464c87185be378e668b4a9abec8 |