Merge branch 'master' into deiflou/screentone_generator
3e39fde12ae7
Actions

Authored by Deif Lou <ginoba@gmail.com> on Jun 24 2020, 7:48 PM.

Description

Merge branch 'master' into deiflou/screentone_generator

Solve conflict in the kis_wdg_generator.cpp file

Details

Committed

Deif Lou <ginoba@gmail.com>

Jun 24 2020, 9:55 PM

Parents

R37:9b96a92cdae1: Change ellipse dot width/height ratio to match the literature on the subject

Branches

Unknown

Tags

Unknown

References

refs/keep-around/3e39fde12ae75f2a8c20de7e58bec7db2a2b50f4

Deif Lou <ginoba@gmail.com> committed R37:3e39fde12ae7: Merge branch 'master' into deiflou/screentone_generator (authored by Deif Lou <ginoba@gmail.com>).Jun 24 2020, 9:55 PM

Changes (310)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			3rdparty/ext_frameworks/CMakeLists.txt
	A			3rdparty/ext_frameworks/karchive.diff
	M			3rdparty/ext_lcms2/CMakeLists.txt
	M			3rdparty/ext_qt/CMakeLists.txt
	M			benchmarks/kis_floodfill_benchmark.cpp
	M			benchmarks/kis_floodfill_benchmark.h
	M			krita/CMakeLists.txt
	M			krita/data/paintoppresets/j)_WaterC_Basic_Lines-Dry.kpp
	M			krita/data/paintoppresets/j)_WaterC_Basic_Lines-Wet-Pattern.kpp
	M			krita/data/paintoppresets/j)_WaterC_Basic_Lines-Wet.kpp
	M			krita/data/paintoppresets/j)_WaterC_Basic_Round-Fringe_02.kpp
	M			krita/data/paintoppresets/j)_WaterC_Basic_Round-Grain.kpp
	M			krita/data/paintoppresets/j)_WaterC_Basic_Round-Grunge.kpp
	M			krita/data/paintoppresets/j)_WaterC_Flat_Big-Grain_Tilt.kpp
	M			krita/data/paintoppresets/j)_WaterC_Flat_Decay_Tilt.kpp
	M			krita/data/paintoppresets/j)_WaterC_Special_Blobs.kpp
	M			krita/data/paintoppresets/j)_WaterC_Special_Splats.kpp
	M			krita/data/paintoppresets/j)_WaterC_Spread-Pattern.kpp
	M			krita/data/paintoppresets/j)_WaterC_Spread.kpp
	M			krita/data/paintoppresets/j)_WaterC_Spread_WideArea.kpp
	M			krita/data/paintoppresets/j)_WaterC_Water-Pattern.kpp
	M			krita/data/templates/animation/.directory
	M			krita/data/workspaces/Animation.kws
	M			krita/krita.action
	M			krita/kritamenu.action
	A			krita/kritaversion.cpp
	M			krita/org.kde.krita.appdata.xml
	P			krita/pics/svg/dark_animation_pause.svg Copied from krita/pics/svg/light_lazyframeOn.svg
	V			krita/pics/svg/{dark_auto-key-off.svg ← dark_lazyframeOff.svg}
	V			krita/pics/svg/{dark_auto-key-on.svg ← dark_lazyframeOn.svg}
	V			krita/pics/svg/{dark_lazyframeOff.svg → dark_auto-key-off.svg}
	V			krita/pics/svg/{dark_lazyframeOn.svg → dark_auto-key-on.svg}
	P			krita/pics/svg/light_animation_pause.svg Copied from krita/pics/svg/light_lazyframeOn.svg
	V			krita/pics/svg/{light_auto-key-off.svg ← light_lazyframeOff.svg}
	V			krita/pics/svg/{light_auto-key-on.svg ← light_lazyframeOn.svg}
	V			krita/pics/svg/{light_lazyframeOff.svg → light_auto-key-off.svg}
	P			krita/pics/svg/light_lazyframeOn.svg Deleted after being copied to multiple locations: krita/pics/svg/dark_animation_pause.svg krita/pics/svg/light_animation_pause.svg krita/pics/svg/light_auto-key-on.svg
	M			krita/pics/svg/svg-icons.qrc
	M			libs/flake/KoCanvasController.h
	M			libs/flake/KoCanvasControllerWidget.cpp
	M			libs/flake/KoSnapProxy.cpp
	M			libs/flake/KoViewConverter.cpp
	M			libs/flake/KoViewConverter.h
	M			libs/flake/tools/KoZoomStrategy.cpp
	M			libs/flake/tools/KoZoomTool.cpp
	M			libs/global/kis_global.h
	M			libs/image/KisPrecisePaintDeviceWrapper.cpp
	M			libs/image/KisProofingConfiguration.cpp
	M			libs/image/KisProofingConfiguration.h
	M			libs/image/brushengine/kis_paintop_settings.cpp
	M			libs/image/brushengine/kis_paintop_settings.h
	M			libs/image/filter/kis_filter_category_ids.cpp
	M			libs/image/floodfill/kis_scanline_fill.cpp
	M			libs/image/floodfill/kis_scanline_fill.h
	M			libs/image/kis_asl_layer_style_serializer.cpp
	M			libs/image/kis_base_node.cpp
	M			libs/image/kis_convolution_painter.cc
	M			libs/image/kis_default_bounds.cpp
	M			libs/image/kis_default_bounds.h
	M			libs/image/kis_default_bounds_base.cpp
	M			libs/image/kis_default_bounds_base.h
	M			libs/image/kis_default_bounds_node_wrapper.cpp
	M			libs/image/kis_default_bounds_node_wrapper.h
	M			libs/image/kis_fill_painter.cc
	M			libs/image/kis_fill_painter.h
	M			libs/image/kis_gradient_painter.cc
	M			libs/image/kis_image.cc
	M			libs/image/kis_image.h
	M			libs/image/kis_image_animation_interface.cpp
	M			libs/image/kis_image_config.cpp
	M			libs/image/kis_image_config.h
	M			libs/image/kis_liquify_transform_worker.cpp
	M			libs/image/kis_liquify_transform_worker.h
	M			libs/image/kis_mask_projection_plane.cpp
	M			libs/image/kis_paint_device.cc
	M			libs/image/kis_perspectivetransform_worker.cpp
	M			libs/image/kis_selection_filters.cpp
	M			libs/image/kis_selection_filters.h
	M			libs/image/kis_transaction_data.cpp
	M			libs/image/tests/kis_asl_layer_style_serializer_test.cpp
	M			libs/image/tests/kis_asl_parser_test.cpp
	M			libs/libkis/Document.cpp
	M			libs/libkis/Mainpage.dox
	M			libs/libkis/Scratchpad.cpp
	M			libs/libkis/Scratchpad.h
	M			libs/libkis/Selection.cpp
	M			libs/libkis/View.cpp
	M			libs/libkis/View.h
	M			libs/libqml/KisSelectionExtras.cpp
	M			libs/pigment/CMakeLists.txt
	M			libs/pigment/KoColorSpace.cpp
	M			libs/pigment/KoColorSpace.h
	M			libs/pigment/KoColorSpacePreserveLightnessUtils.h
	M			libs/pigment/colorspaces/KoRgbU16ColorSpace.cpp
	M			libs/pigment/colorspaces/KoRgbU16ColorSpace.h
	M			libs/pigment/colorspaces/KoRgbU8ColorSpace.cpp
	M			libs/pigment/colorspaces/KoRgbU8ColorSpace.h
	M			libs/pigment/resources/KoAbstractGradient.h
	A			libs/pigment/resources/KoCachedGradient.h
	M			libs/pigment/resources/KoPattern.cpp
	M			libs/pigment/resources/KoPattern.h
	M			libs/pigment/resources/KoSegmentGradient.cpp
	M			libs/pigment/resources/KoSegmentGradient.h
	M			libs/pigment/resources/KoStopGradient.cpp
	M			libs/pigment/resources/KoStopGradient.h
	M			libs/psd/asl/kis_asl_xml_parser.cpp
	M			libs/psd/asl/kis_asl_xml_writer.cpp
	M			libs/psd/asl/kis_asl_xml_writer.h
	M			libs/resources/KisResourceLocator.cpp
	M			libs/ui/CMakeLists.txt
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisDocument.h
	M			libs/ui/KisReferenceImage.cpp
	M			libs/ui/KisView.cpp
	M			libs/ui/KisView.h
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/actions/kis_selection_action_factories.cpp
	M			libs/ui/canvas/kis_animation_player.cpp
	M			libs/ui/canvas/kis_animation_player.h
	M			libs/ui/canvas/kis_coordinates_converter.cpp
	M			libs/ui/canvas/kis_coordinates_converter.h
	M			libs/ui/dialogs/KisSessionManagerDialog.cpp
	M			libs/ui/dialogs/KisSessionManagerDialog.h
	M			libs/ui/dialogs/kis_dlg_generator_layer.cpp
	M			libs/ui/dialogs/kis_dlg_image_properties.cc
	D			libs/ui/forms/kis_previewwidgetbase.ui
	M			libs/ui/forms/wdgGamutMaskToolbar.ui
	M			libs/ui/forms/wdgautogradient.ui
	M			libs/ui/forms/wdgdisplaysettings.ui
	M			libs/ui/forms/wdgdlgfilelayer.ui
	M			libs/ui/forms/wdggeneralsettings.ui
	M			libs/ui/forms/wdggeometryoptions.ui
	M			libs/ui/forms/wdgimageproperties.ui
	M			libs/ui/forms/wdgmultipliersdoublesliderspinbox.ui
	M			libs/ui/forms/wdgnewimage.ui
	M			libs/ui/forms/wdgperformancesettings.ui
	M			libs/ui/forms/wdgpreseticonlibrary.ui
	M			libs/ui/forms/wdgstopgradienteditor.ui
	M			libs/ui/kis_autogradient.cc
	M			libs/ui/kis_autogradient.h
	M			libs/ui/kis_canvas_resource_provider.cpp
	M			libs/ui/kis_canvas_resource_provider.h
	M			libs/ui/kis_control_frame.cpp
	M			libs/ui/kis_derived_resources.cpp
	M			libs/ui/kis_derived_resources.h
	M			libs/ui/kis_node_filter_proxy_model.cpp
	M			libs/ui/kis_node_filter_proxy_model.h
	M			libs/ui/kis_node_manager.cpp
	M			libs/ui/kis_node_manager.h
	M			libs/ui/kis_node_model.cpp
	M			libs/ui/kis_painting_assistant.cc
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/kis_paintop_box.h
	M			libs/ui/kis_stopgradient_editor.cpp
	M			libs/ui/kis_stopgradient_editor.h
	M			libs/ui/opengl/kis_opengl_canvas2.cpp
	M			libs/ui/processing/fill_processing_visitor.cpp
	M			libs/ui/processing/fill_processing_visitor.h
	M			libs/ui/tests/fill_processing_visitor_test.cpp
	M			libs/ui/tool/kis_resources_snapshot.cpp
	M			libs/ui/tool/kis_tool_paint.cc
	M			libs/ui/tool/strokes/freehand_stroke.cpp
	M			libs/ui/tool/strokes/kis_filter_stroke_strategy.cpp
	M			libs/ui/widgets/kis_color_filter_combo.cpp
	M			libs/ui/widgets/kis_color_filter_combo.h
	A			libs/ui/widgets/kis_color_label_button.cpp
	A			libs/ui/widgets/kis_color_label_button.h
	M			libs/ui/widgets/kis_color_label_selector_widget.cpp
	M			libs/ui/widgets/kis_color_label_selector_widget.h
	M			libs/ui/widgets/kis_gradient_chooser.cc
	M			libs/ui/widgets/kis_gradient_chooser.h
	A			libs/ui/widgets/kis_layer_filter_widget.cpp
	A			libs/ui/widgets/kis_layer_filter_widget.h
	M			libs/ui/widgets/kis_multipliers_double_slider_spinbox.cpp
	M			libs/ui/widgets/kis_multipliers_double_slider_spinbox.h
	M			libs/ui/widgets/kis_scratch_pad.cpp
	M			libs/ui/widgets/kis_scratch_pad.h
	D			libs/ui/widgets/kis_slider_spin_box.h
	M			libs/ui/widgets/kis_stopgradient_slider_widget.cpp
	M			libs/ui/widgets/kis_stopgradient_slider_widget.h
	A			libs/ui/widgets/kis_transport_controls.cpp
	P			libs/ui/widgets/kis_transport_controls.h Copied from plugins/dockers/animation/timeline_docker.h
	A			libs/ui/widgets/kis_utility_title_bar.cpp
	P			libs/ui/widgets/kis_utility_title_bar.h Copied from plugins/dockers/animation/timeline_layers_header.h
	M			libs/ui/widgets/kis_wdg_generator.cpp
	M			libs/ui/widgets/kis_wdg_generator.h
	M			libs/widgets/KisGradientSliderWidget.cpp
	M			libs/widgets/KisGradientSliderWidget.h
	M			libs/widgets/KoResourceServerProvider.cpp
	M			libs/widgets/KoToolBox.cpp
	M			libs/widgetutils/CMakeLists.txt
	M			libs/widgetutils/kis_action_registry.cpp
	A			libs/widgetutils/kis_zoom_scrollbar.cpp
	A			libs/widgetutils/kis_zoom_scrollbar.h
	M			packaging/android/androidbuild.sh
	M			packaging/linux/snap/snapcraft.yaml
	M			packaging/macos/osxbuild.sh
	M			packaging/windows/installer/MakeInstallerNsis.cmake.in
	P			plugins/assistants/Assistants/KisAssistantTool.action Copied from plugins/tools/tool_polygon/KisToolPolygon.action
	M			plugins/assistants/Assistants/VanishingPointAssistant.cc
	M			plugins/assistants/Assistants/kis_assistant_tool.cc
	M			plugins/color/lcms2engine/LcmsColorSpace.h
	M			plugins/color/lcms2engine/colorspaces/rgb_f16/RgbF16ColorSpace.cpp
	M			plugins/color/lcms2engine/colorspaces/rgb_f16/RgbF16ColorSpace.h
	M			plugins/color/lcms2engine/colorspaces/rgb_f32/RgbF32ColorSpace.cpp
	M			plugins/color/lcms2engine/colorspaces/rgb_f32/RgbF32ColorSpace.h
	M			plugins/color/lcms2engine/colorspaces/rgb_u16/RgbU16ColorSpace.cpp
	M			plugins/color/lcms2engine/colorspaces/rgb_u16/RgbU16ColorSpace.h
	M			plugins/color/lcms2engine/colorspaces/rgb_u8/RgbU8ColorSpace.cpp
	M			plugins/color/lcms2engine/colorspaces/rgb_u8/RgbU8ColorSpace.h
	M			plugins/dockers/advancedcolorselector/kis_color_selector.cpp
	M			plugins/dockers/advancedcolorselector/kis_color_selector_base.cpp
	M			plugins/dockers/advancedcolorselector/kis_color_selector_container.cpp
	M			plugins/dockers/advancedcolorselector/kis_color_selector_settings.cpp
	M			plugins/dockers/advancedcolorselector/kis_color_selector_settings.h
	M			plugins/dockers/advancedcolorselector/kis_minimal_shade_selector.cpp
	M			plugins/dockers/advancedcolorselector/kis_shade_selector_line_combo_box_popup.cpp
	M			plugins/dockers/advancedcolorselector/wdg_color_selector_settings.ui
	M			plugins/dockers/animation/CMakeLists.txt
	D			plugins/dockers/animation/animation_docker.cpp
	D			plugins/dockers/animation/animation_docker.h
	M			plugins/dockers/animation/animation_dockers.cpp
	M			plugins/dockers/animation/kis_animation_curve_docker.cpp
	M			plugins/dockers/animation/kis_time_based_item_model.cpp
	M			plugins/dockers/animation/kis_time_based_item_model.h
	M			plugins/dockers/animation/onion_skins_docker.cpp
	M			plugins/dockers/animation/onion_skins_docker.h
	M			plugins/dockers/animation/onion_skins_docker.ui
	M			plugins/dockers/animation/timeline_docker.cpp
	P			plugins/dockers/animation/timeline_docker.h Copied to libs/ui/widgets/kis_transport_controls.h
	M			plugins/dockers/animation/timeline_frames_model.cpp
	M			plugins/dockers/animation/timeline_frames_model.h
	M			plugins/dockers/animation/timeline_frames_view.cpp
	M			plugins/dockers/animation/timeline_frames_view.h
	M			plugins/dockers/animation/timeline_layers_header.cpp
	P			plugins/dockers/animation/timeline_layers_header.h Copied to libs/ui/widgets/kis_utility_title_bar.h
	M			plugins/dockers/animation/timeline_ruler_header.cpp
	M			plugins/dockers/animation/timeline_ruler_header.h
	D			plugins/dockers/animation/wdg_animation.ui
	M			plugins/dockers/layerdocker/LayerBox.cpp
	M			plugins/dockers/layerdocker/LayerBox.h
	M			plugins/dockers/layerdocker/WdgLayerBox.ui
	M			plugins/dockers/lut/black_white_point_chooser.cpp
	M			plugins/extensions/modify_selection/dlg_border_selection.cc
	M			plugins/extensions/modify_selection/dlg_border_selection.h
	M			plugins/extensions/modify_selection/modify_selection_operations.cpp
	M			plugins/extensions/modify_selection/wdg_border_selection.ui
	M			plugins/extensions/pykrita/sip/krita/Document.sip
	M			plugins/extensions/pykrita/sip/krita/Scratchpad.sip
	M			plugins/extensions/pykrita/sip/krita/View.sip
	M			plugins/extensions/resourcemanager/dlg_bundle_manager.cpp
	M			plugins/extensions/resourcemanager/dlg_bundle_manager.h
	M			plugins/extensions/resourcemanager/wdgdlgbundlemanager.ui
	M			plugins/filters/blur/kis_lens_blur_filter.cpp
	M			plugins/filters/blur/kis_wdg_lens_blur.cpp
	M			plugins/filters/blur/kis_wdg_lens_blur.h
	M			plugins/filters/gradientmap/krita_filter_gradient_map.cpp
	M			plugins/filters/roundcorners/kis_round_corners_filter.cpp
	M			plugins/impex/jpeg/krita_jpeg_export.json
	M			plugins/impex/jpeg/krita_jpeg_import.json
	M			plugins/impex/libkra/kis_kra_loader.cpp
	M			plugins/impex/libkra/kis_kra_saver.cpp
	M			plugins/impex/ora/kis_open_raster_stack_save_visitor.cpp
	M			plugins/impex/qimageio/krita_qimageio.desktop
	M			plugins/impex/qimageio/krita_qimageio_export.json
	M			plugins/impex/qimageio/krita_qimageio_import.json
	M			plugins/paintops/defaultpaintops/brush/KisBrushOpResources.cpp
	M			plugins/paintops/defaultpaintops/brush/kis_brushop.cpp
	M			plugins/paintops/filterop/kis_filterop_settings.cpp
	M			plugins/paintops/filterop/kis_filterop_settings.h
	M			plugins/paintops/hairy/kis_hairy_paintop_settings.cpp
	M			plugins/paintops/hairy/kis_hairy_paintop_settings.h
	M			plugins/paintops/libpaintop/KisTextureMaskInfo.cpp
	M			plugins/paintops/libpaintop/KisTextureMaskInfo.h
	M			plugins/paintops/libpaintop/forms/wdgtexturechooser.ui
	M			plugins/paintops/libpaintop/kis_brush_based_paintop.cpp
	M			plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
	M			plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h
	M			plugins/paintops/libpaintop/kis_brush_chooser.cpp
	M			plugins/paintops/libpaintop/kis_texture_chooser.cpp
	M			plugins/paintops/libpaintop/kis_texture_option.cpp
	M			plugins/paintops/libpaintop/kis_texture_option.h
	M			plugins/paintops/sketch/kis_sketch_paintop_settings.cpp
	M			plugins/paintops/sketch/kis_sketch_paintop_settings.h
	M			plugins/python/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
	M			plugins/python/batch_exporter/kritapykrita_batch_exporter.desktop
	M			plugins/python/channels2layers/kritapykrita_channels2layers.desktop
	M			plugins/python/comics_project_management_tools/kritapykrita_comics_project_management_tools.desktop
	M			plugins/python/filtermanager/kritapykrita_filtermanager.desktop
	M			plugins/python/hello/kritapykrita_hello.desktop
	M			plugins/python/highpass/kritapykrita_highpass.desktop
	M			plugins/python/krita_script_starter/krita_script_starter.py
	M			plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
	M			plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
	M			plugins/python/mixer_slider_docker/kritapykrita_mixer_slider_docker.desktop
	M			plugins/python/palette_docker/kritapykrita_palette_docker.desktop
	M			plugins/python/selectionsbagdocker/kritapykrita_selectionsbagdocker.desktop
	M			plugins/python/tenbrushes/tenbrushes.py
	M			plugins/tools/basictools/kis_tool_fill.cc
	M			plugins/tools/basictools/kis_tool_fill.h
	M			plugins/tools/basictools/kis_tool_gradient.cc
	M			plugins/tools/selectiontools/kis_tool_select_contiguous.cc
	M			plugins/tools/selectiontools/kis_tool_select_contiguous.h
	M			plugins/tools/tool_crop/KisToolCrop.action
	P			plugins/tools/tool_polygon/KisToolPolygon.action Copied to plugins/assistants/Assistants/KisAssistantTool.action
	M			plugins/tools/tool_smart_patch/kis_inpaint.cpp
	M			plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
	M			plugins/tools/tool_transform2/KisToolTransform.action
	M			plugins/tools/tool_transform2/tool_transform_args.cc
	M			sdk/tests/lod_override.h