[krita] [Bug 441347] Brushtips deleted from the Krita5 Resource Manager, but needed for default brushes

[Halla Rempt]

https://bugs.kde.org/show_bug.cgi?id=441347

Halla Rempt <halla at valdyas.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
      Latest Commit|https://invent.kde.org/grap |https://invent.kde.org/grap
                   |hics/krita/commit/91bbbd5ff |hics/krita/commit/8628fd22c
                   |d64c918cb882815f71c097c8c22 |755584ef3606732bf3dbe6af8e2
                   |0bf9                        |b904

--- Comment #3 from Halla Rempt <halla at valdyas.org> ---
Git commit 8628fd22c755584ef3606732bf3dbe6af8e2b904 by Halla Rempt.
Committed on 07/09/2021 at 09:02.
Pushed by rempt into branch 'krita/5.0'.

Fix loading legacy brush masks

If there are two resources in two storages that have the same
md5sum (square_rough.png and texture_3.png), we need to make
sure that the one with the filename stored in the preset can
be found, so now resources(md5, filename, name) returns all
matching resources.
Related: bug 441350
(cherry picked from commit 91bbbd5ffd64c918cb882815f71c097c8c220bf9)

M  +17   -6    libs/brush/kis_predefined_brush_factory.cpp
M  +25   -22   libs/image/brushengine/kis_paintop_preset.cpp
M  +3    -0    libs/image/brushengine/kis_paintop_settings.cpp
M  +1    -1    libs/image/kis_properties_configuration.cc
M  +3    -3    libs/psd/psd.h
M  +7    -6    libs/resources/KisGlobalResourcesInterface.cpp
M  +3    -4    libs/resources/KisLinkedResourceWrapper.h
M  +36   -33   libs/resources/KisLocalStrokeResources.cpp
M  +1    -0    libs/resources/KisRequiredResourcesOperators.h
M  +33   -13   libs/resources/KisResourceModel.cpp
M  +3    -3    libs/resources/KisResourceModel.h
M  +63   -23   libs/resources/KisResourcesInterface.h
M  +19   -5    libs/resources/KoResourceServer.h
M  +0    -1    libs/resourcewidgets/dbexplorer/DlgDbExplorer.cpp
M  +4    -1    libs/ui/utils/KisDitherUtil.cpp
M  +12   -4    libs/ui/widgets/KisDitherWidget.cpp
M  +0    -1    libs/ui/widgets/kis_preset_chooser.cpp
M  +12   -3    libs/ui/widgets/kis_workspace_chooser.cpp
M  +11   -2   
plugins/filters/gradientmap/KisGradientMapFilterConfiguration.cpp
M  +9    -1    plugins/filters/palettize/palettize.cpp
M  +7    -2    plugins/generators/pattern/kis_wdg_pattern.cpp
M  +5    -1    plugins/generators/pattern/patterngenerator.cpp
M  +1    -0    plugins/paintops/libpaintop/KisMaskingBrushOption.cpp
M  +2    -3    plugins/paintops/libpaintop/KisTextureMaskInfo.cpp
M  +0    -2    plugins/paintops/libpaintop/kis_brush_option.cpp
M  +15   -4    plugins/paintops/libpaintop/kis_linked_pattern_manager.cpp
M  +9    -6    plugins/paintops/libpaintop/kis_texture_option.cpp

https://invent.kde.org/graphics/krita/commit/8628fd22c755584ef3606732bf3dbe6af8e2b904

-- 
You are receiving this mail because:
You are watching all bug changes.