Merge branch 'master' into rempt/update-frameworks
70ed5361bfcd
Actions

Authored by rempt on May 8 2018, 7:18 AM.

Description

Merge branch 'master' into rempt/update-frameworks

Details

Committed

May 8 2018, 7:18 AM

Parents

R37:39e28e703aa8: Fix build on ARM (partly)
R37:a4c119966403: Renamed Document::setBackGroundColor to setBackgroundColor

Branches

Unknown

Tags

Unknown

rempt committed R37:70ed5361bfcd: Merge branch 'master' into rempt/update-frameworks (authored by rempt).May 8 2018, 7:18 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
a4c119966403	rempt	Renamed Document::setBackGroundColor to setBackgroundColor	May 8 2018
8b5236f14bb6	rempt	Fix possible crash in KisColorizeMask	May 7 2018
ee5f1f6e3ddc	jounip	Remove experimental code	May 7 2018
29ad1486d81d	dkazakov	Fix keeping "eraser switch size/opacity" option when saving the brush	May 7 2018
a32ca9d9f9cf	dkazakov	Fix a hangup when closing the image	May 7 2018
79a52ba87fc0	rempt	Fix a possible crash when creating a KoColorPopup action	May 7 2018
21e8384d8ee1	rempt	Rename foreGround/backGround to foreground/background	May 7 2018
24f97f7d951a	rempt	Add Document::setBackgroundColor API	May 7 2018
4cbc15c8869a	dkazakov	Move Isolate Mode activation and deactivation into a stroke	May 6 2018
8b2309a39fa5	rempt	Make it possible to load bmp images with the suffix in all CAPS	May 6 2018
5faf74b01db1	dkazakov	Rename KisCloneInfo into KisNodeUuidInfo	May 6 2018
b6c39175b43c	dkazakov	Fix copy-paste frames operation when the timeline layout changes	May 6 2018
1d6a7e2ec62c	alvinhochun	Readd errorously removed bracket	May 5 2018
00e39765a152	dkazakov	Fix an assert in KisCloneLayerTest	May 4 2018
dac4dc72f502	dkazakov	Fix running GDB under docker	May 4 2018
6386356faca7	dkazakov	Fix saving state of the selection masks into .kra	May 4 2018
380e271df5b0	jounip	Fix constant redrawing of reference images	May 4 2018
ba8095120fa9	jounip	Remove extraneous items in reference images tool context menu	May 4 2018
40d8fa30abce	dkazakov	Fix a safe assert in RoundMarker brush	May 4 2018
739536ba847b	dkazakov	Fix playback in isolated mode	May 4 2018
b6f4de190276	dkazakov	Fix two small misprints in the docker manual	May 4 2018
3119ea6932c5	dkazakov	Fix saving animated transparency and filter masks, adjustment layer	May 4 2018
b0275f3e0e1e	rempt	Check pointers before dereferencing	May 4 2018
0806ff8eaac8	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	May 4 2018
449a74db909d	rempt	Read multilayer EXR files saved by Nuke	May 3 2018
e443b1a71911	dkazakov	Fix PVS-Studio warning: overwriting the parameter	May 2 2018
463064c19383	dkazakov	Fix one more misprint in the docker manual	May 2 2018
d71649518adb	dkazakov	Fix a misprint in the README for the docker build	May 2 2018
545e441c33fd	rempt	Fix typo	May 2 2018
8b84c126bc04	dkazakov	Add a framework for building Krita under Docker	May 2 2018
a99fea91085a	rempt	Show the exact bounds in the layer properties dialog	Apr 30 2018
9c49eff3b14e	scottpetrovic	Add ability for vanishing point assistants to show and configure radial lines	Apr 29 2018
2e8cf3911ed8	rempt	Make the Saturation slider update when picking a color that has Value 100	Apr 28 2018
1baf0f9cccd7	rempt	PSD: convert the image if its colorspace is not supported	Apr 27 2018
1f5274c92f30	rempt	Remove connection to a non-existent signal	Apr 27 2018
8a53ca7851b0	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 27 2018
4832f4da6cbc	scottpetrovic	set size for a few timeline icons as it is painfully small on Windows	Apr 26 2018
c3a2985dd60f	scottpetrovic	increase the range for the pixel grid threshold (by request)	Apr 26 2018
b02cac934d02	scottpetrovic	Make sure to update brush tip settings when changing presets	Apr 26 2018
84089c1e79d2	dkazakov	Fix PVS-Studio warning: fix Hairy Brush ink opacity depletion	Apr 26 2018
df9276861724	dkazakov	Fix PVS-Studio warning: naver happening 'if' condition	Apr 26 2018
9790c311ed0d	dkazakov	Fix PVS-Studio warning: misprint in KisPressureSizeOption::lodLimitations()	Apr 26 2018
2102af05a2c1	dkazakov	Fix PVS-Studio warning: the loop iterates only once	Apr 26 2018
f912a10eda97	dkazakov	Fix PVS-Studio warning: loop is actually infinite	Apr 26 2018
368bd56bfd93	dkazakov	Fix PVS-Studio warning: uninitialized variables in KisMinHeap	Apr 26 2018
2993d536bce0	dkazakov	Fix PVS-Studio warning: html correctness in about dialog	Apr 26 2018
7bc329344257	dkazakov	Fix PVS-Studio warning: parseTagName() should actually return some value	Apr 26 2018
03d026c9179f	dkazakov	Fix PVS-Studio warning: for-each loop should accept a reference to actually do…	Apr 26 2018
b1806fb959f2	dkazakov	Fix PVS-Studio warning: fix logic of 'if's	Apr 26 2018
9f76caa714c3	dkazakov	Fix PVS-Studio warning: uninitialized variables used in the loop	Apr 26 2018

Changes (279)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		3rdparty/ext_qt/CMakeLists.txt
A		3rdparty/ext_qt/QTBUG-57299.diff
M		benchmarks/kis_fast_math_benchmark.cpp
M		benchmarks/kis_gradient_benchmark.cpp
M		benchmarks/kis_random_iterator_benchmark.cpp
M		benchmarks/kis_stroke_benchmark.cpp
A	(dir)	build-tools/docker/
A		build-tools/docker/.gitignore
A		build-tools/docker/Dockerfile
A		build-tools/docker/README.md
A	(dir)	build-tools/docker/bin/
A		build-tools/docker/bin/bootstrap-deps.sh
A		build-tools/docker/bin/build_image
A		build-tools/docker/bin/enter_container
A		build-tools/docker/bin/run_container
A	(dir)	build-tools/docker/default-home/
A		build-tools/docker/default-home/.bash_aliases
A		build-tools/docker/default-home/devenv.inc
A		build-tools/docker/default-home/run_cmake.sh
M		krita/krita.action
M		krita/main.cc
M		libs/brush/tests/kis_gbr_brush_test.cpp
M		libs/brush/tests/kis_imagepipe_brush_test.cpp
M		libs/flake/CMakeLists.txt
M		libs/flake/KoConnectionShape.cpp
M		libs/flake/KoImageData_p.cpp
M		libs/flake/KoPathShape.cpp
M		libs/flake/KoPathShape.h
M		libs/flake/KoPathShape_p.h
M		libs/flake/KoShape.cpp
M		libs/flake/KoToolManager.cpp
M		libs/flake/commands/KoMultiPathPointMergeCommand.cpp
M		libs/flake/commands/KoPathBreakAtPointCommand.cpp
A		libs/flake/commands/KoPathMergeUtils.cpp
V		libs/{flake/commands/KoPathMergeUtils.h ← ui/widgets/KisLayoutSelector.h}
M		libs/flake/commands/KoPathPointInsertCommand.cpp
M		libs/flake/commands/KoPathPointMergeCommand.cpp
M		libs/flake/commands/KoPathPointRemoveCommand.cpp
M		libs/flake/commands/KoPathSegmentBreakCommand.cpp
M		libs/flake/commands/KoShapeReorderCommand.cpp
M		libs/flake/commands/KoSubpathJoinCommand.cpp
M		libs/flake/commands/KoSubpathJoinCommand.h
M		libs/flake/resources/KoSvgSymbolCollectionResource.cpp
M		libs/flake/svg/SvgParser.cpp
M		libs/flake/svg/SvgStyleParser.cpp
M		libs/flake/svg/SvgStyleWriter.cpp
M		libs/flake/text/KoSvgTextShapeMarkupConverter.cpp
M		libs/flake/tools/KoPathTool.cpp
M		libs/flake/tools/KoPathTool.h
M		libs/flake/tools/KoPathToolSelection.cpp
M		libs/flake/tools/KoPathToolSelection.h
M		libs/global/kis_algebra_2d.cpp
M		libs/global/kis_debug.cpp
M		libs/image/CMakeLists.txt
M		libs/image/commands_new/kis_saved_commands.cpp
M		libs/image/kis_base_node.h
V		libs/image/{kis_clone_info.cpp → kis_node_uuid_info.cpp}
V		libs/image/{kis_clone_info.h → kis_node_uuid_info.h}
M		libs/image/kis_clone_layer.cpp
M		libs/image/kis_clone_layer.h
M		libs/image/kis_convolution_worker_spatial.h
M		libs/image/kis_idle_watcher.cpp
M		libs/image/kis_image.cc
M		libs/image/kis_image.h
M		libs/image/kis_keyframe_channel.cpp
M		libs/image/kis_keyframe_channel.h
M		libs/image/kis_keyframe_commands.cpp
M		libs/image/kis_keyframe_commands.h
M		libs/image/kis_layer.cc
M		libs/image/kis_mask.cc
M		libs/image/kis_node.cpp
V		libs/image/{kis_node_uuid_info.cpp ← kis_clone_info.cpp}
V		libs/image/{kis_node_uuid_info.h ← kis_clone_info.h}
M		libs/image/kis_paint_device.cc
M		libs/image/kis_paint_device.h
M		libs/image/kis_paint_layer.cc
M		libs/image/kis_pixel_selection.cpp
M		libs/image/kis_pixel_selection.h
M		libs/image/kis_processing_applicator.cpp
M		libs/image/kis_properties_configuration.cc
M		libs/image/kis_raster_keyframe_channel.cpp
M		libs/image/kis_selection.cc
M		libs/image/kis_selection_based_layer.cpp
M		libs/image/kis_selection_filters.cpp
M		libs/image/kis_selection_mask.cpp
M		libs/image/kis_transform_worker.cc
M		libs/image/kis_update_scheduler.cpp
M		libs/image/lazybrush/kis_colorize_mask.cpp
M		libs/image/metadata/kis_meta_data_value.h
M		libs/image/tests/kis_clone_layer_test.cpp
M		libs/image/tests/kis_iterator_test.cpp
M		libs/image/tests/kis_iterators_ng_test.cpp
M		libs/image/tests/kis_keyframing_test.cpp
M		libs/image/tests/kis_mask_generator_test.cpp
M		libs/image/tests/kis_meta_data_test.cpp
M		libs/image/tests/kis_paint_device_test.cpp
M		libs/image/tests/kis_simple_update_queue_test.cpp
M		libs/image/tiles3/kis_tiled_data_manager.cc
M		libs/libkis/Document.cpp
M		libs/libkis/Document.h
M		libs/libkis/View.cpp
M		libs/libkis/View.h
M		libs/libqml/qml/panels/EditLayerPage.qml
M		libs/odf/KoOdfNumberDefinition.cpp
M		libs/pigment/compositeops/KoOptimizedCompositeOpAlphaDarken128.h
M		libs/pigment/compositeops/KoOptimizedCompositeOpAlphaDarken32.h
M		libs/pigment/resources/KoColorSet.cpp
M		libs/psd/psd.h
M		libs/psd/psd_pattern.cpp
M		libs/psd/psd_utils.cpp
M		libs/ui/CMakeLists.txt
M		libs/ui/KisDecorationsManager.cpp
M		libs/ui/KisDocument.cpp
M		libs/ui/KisReferenceImagesDecoration.cpp
M		libs/ui/KisView.cpp
M		libs/ui/KisWindowLayoutManager.cpp
M		libs/ui/KisWindowLayoutManager.h
M		libs/ui/KisWindowLayoutResource.cpp
M		libs/ui/actions/KisPasteActionFactory.cpp
M		libs/ui/actions/kis_selection_action_factories.cpp
M		libs/ui/dialogs/KisSessionManagerDialog.cpp
M		libs/ui/dialogs/kis_about_application.cpp
M		libs/ui/dialogs/kis_dlg_layer_properties.cc
M		libs/ui/forms/wdgdisplaysettings.ui
M		libs/ui/forms/wdglayerproperties.ui
M		libs/ui/input/kis_input_manager_p.cpp
M		libs/ui/input/wintab/kis_tablet_support_win.cpp
M		libs/ui/input/wintab/kis_tablet_support_win.h
M		libs/ui/input/wintab/kis_tablet_support_win8.cpp
M		libs/ui/input/wintab/kis_tablet_support_win8.h
M		libs/ui/kis_action_manager.cpp
M		libs/ui/kis_action_manager.h
M		libs/ui/kis_clipboard.cc
M		libs/ui/kis_clipboard.h
M		libs/ui/kis_min_heap.h
M		libs/ui/kis_node_juggler_compressed.cpp
M		libs/ui/kis_node_manager.cpp
M		libs/ui/kis_painting_assistant.cc
M		libs/ui/kis_painting_assistant.h
M		libs/ui/kis_painting_assistants_decoration.cpp
M		libs/ui/kis_painting_assistants_decoration.h
M		libs/ui/kis_paintop_box.cc
M		libs/ui/kis_png_converter.cpp
M		libs/ui/kis_popup_palette.cpp
M		libs/ui/kis_popup_palette.h
M		libs/ui/kis_stopgradient_editor.cpp
M		libs/ui/kisexiv2/kis_xmp_io.cpp
M		libs/ui/opengl/kis_texture_tile.cpp
M		libs/ui/tool/kis_tool_paint.cc
D		libs/ui/widgets/KisLayoutSelector.cpp
V		libs/{ui/widgets/KisLayoutSelector.h → flake/commands/KoPathMergeUtils.h}
M		libs/ui/widgets/KisVisualEllipticalSelectorShape.cpp
M		libs/ui/widgets/KisVisualRectangleSelectorShape.cpp
M		libs/ui/widgets/KoFillConfigWidget.cpp
M		libs/ui/widgets/kis_color_label_selector_widget.cpp
M		libs/ui/widgets/kis_gradient_chooser.cc
M		libs/ui/widgets/kis_paintop_presets_save.cpp
M		libs/ui/widgets/kis_preset_live_preview_view.cpp
M		libs/ui/widgets/kis_stopgradient_slider_widget.cpp
M		libs/widgets/KoColorPopupAction.cpp
M		libs/widgets/KoPagePreviewWidget.cpp
M		libs/widgets/KoResourceItemChooser.cpp
M		libs/widgets/KoRuler.cpp
M		libs/widgets/tests/zoomhandler_test.cpp
M		libs/widgetutils/config/khelpclient.cpp
M		plugins/assistants/Assistants/AssistantsToolOptions.ui
M		plugins/assistants/Assistants/VanishingPointAssistant.cc
M		plugins/assistants/Assistants/VanishingPointAssistant.h
M		plugins/assistants/Assistants/kis_assistant_tool.cc
M		plugins/assistants/Assistants/kis_assistant_tool.h
M		plugins/color/lcms2engine/LcmsEnginePlugin.cpp
M		plugins/dockers/CMakeLists.txt
M		plugins/dockers/advancedcolorselector/kis_color_selector_base.cpp
M		plugins/dockers/advancedcolorselector/kis_color_selector_wheel.cpp
M		plugins/dockers/animation/animation_docker.cpp
M		plugins/dockers/animation/animation_docker.h
M		plugins/dockers/animation/kis_animation_utils.cpp
M		plugins/dockers/animation/kis_animation_utils.h
M		plugins/dockers/animation/kis_draggable_tool_button.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/tests/CMakeLists.txt
A		plugins/dockers/animation/tests/kis_animation_utils_test.cpp
A		plugins/dockers/animation/tests/kis_animation_utils_test.h
M		plugins/dockers/animation/timeline_docker.cpp
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_ruler_header.cpp
M		plugins/dockers/animation/timeline_ruler_header.h
M		plugins/dockers/colorslider/kis_color_slider_input.cpp
M		plugins/dockers/defaultdockers/kis_layer_box.cpp
M		plugins/dockers/defaultdockers/kis_layer_box.h
M		plugins/dockers/griddocker/grid_config_widget.cpp
M		plugins/dockers/griddocker/grid_config_widget.h
M		plugins/dockers/griddocker/griddocker_dock.cpp
M		plugins/dockers/lut/ocio_display_filter.cpp
M		plugins/dockers/overview/overviewwidget.cc
D		plugins/dockers/pager
D		plugins/dockers/pager/CMakeLists.txt
D		plugins/dockers/pager/PagerDockerDock.cpp
D		plugins/dockers/pager/PagerDockerDock.h
D		plugins/dockers/pager/PagerDockerPlugin.cpp
D		plugins/dockers/pager/PagerDockerPlugin.h
D		plugins/dockers/pager/krita_pagerdocker.json
M		plugins/dockers/palettedocker/palettedocker_dock.cpp
M		plugins/extensions/pykrita/sip/krita/Document.sip
M		plugins/extensions/pykrita/sip/krita/View.sip
M		plugins/extensions/waveletdecompose/waveletdecompose.cpp
M		plugins/filters/colorsfilters/kis_perchannel_filter.cpp
M		plugins/flake/artistictextshape/ArtisticTextTool.cpp
M		plugins/flake/pathshapes/ellipse/EllipseShape.cpp
M		plugins/flake/pathshapes/enhancedpath/EnhancedPathFormula.cpp
M		plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp
M		plugins/flake/pathshapes/rectangle/RectangleShape.cpp
M		plugins/flake/pathshapes/spiral/SpiralShape.cpp
M		plugins/flake/pathshapes/star/StarShape.cpp
M		plugins/flake/textshape/TextTool.cpp
M		plugins/flake/textshape/kotext/BibliographyGenerator.cpp
M		plugins/flake/textshape/kotext/KoAnchorTextRange.cpp
M		plugins/flake/textshape/kotext/KoInlineTextObjectManager.cpp
M		plugins/flake/textshape/kotext/KoTextDebug.cpp
M		plugins/flake/textshape/kotext/OdfTextTrackStyles.cpp
M		plugins/flake/textshape/kotext/opendocument/KoTextSharedLoadingData.cpp
M		plugins/flake/textshape/kotext/opendocument/KoTextWriter.cpp
M		plugins/flake/textshape/kotext/opendocument/KoTextWriter_p.cpp
M		plugins/flake/textshape/kotext/opendocument/KoTextWriter_p.h
M		plugins/flake/textshape/kotext/styles/KoListLevelProperties.cpp
M		plugins/flake/textshape/textlayout/KoTextLayoutArea.cpp
M		plugins/impex/brush/kis_brush_export.cpp
M		plugins/impex/csv/csv_saver.cpp
M		plugins/impex/exr/exr_converter.cc
M		plugins/impex/kra/kra_converter.cpp
M		plugins/impex/libkra/kis_kra_load_visitor.cpp
M		plugins/impex/libkra/kis_kra_load_visitor.h
M		plugins/impex/libkra/kis_kra_loader.cpp
M		plugins/impex/libkra/kis_kra_save_visitor.cpp
M		plugins/impex/ora/kis_open_raster_stack_load_visitor.cpp
M		plugins/impex/ora/kis_open_raster_stack_save_visitor.cpp
M		plugins/impex/pdf/kis_pdf_import.cpp
M		plugins/impex/ppm/kis_ppm_import.cpp
M		plugins/impex/psd/psd_additional_layer_info_block.cpp
M		plugins/impex/psd/psd_export.cc
M		plugins/impex/psd/psd_header.cpp
M		plugins/impex/psd/psd_layer_section.cpp
M		plugins/impex/psd/psd_loader.cpp
M		plugins/impex/psd/psd_pixel_utils.cpp
M		plugins/impex/psd/psd_saver.cpp
M		plugins/impex/qimageio/kis_qimageio_import.cpp
M		plugins/impex/spriter/kis_spriter_export.cpp
M		plugins/impex/spriter/kis_spriter_export.h
M		plugins/paintops/gridbrush/kis_grid_paintop.cpp
M		plugins/paintops/hairy/hairy_brush.cpp
M		plugins/paintops/libpaintop/forms/wdgcurveoption.ui
M		plugins/paintops/libpaintop/forms/wdgflowopacityoption.ui
M		plugins/paintops/libpaintop/kis_brush_chooser.cpp
M		plugins/paintops/libpaintop/kis_brush_chooser.h
M		plugins/paintops/libpaintop/kis_curve_option_widget.cpp
M		plugins/paintops/libpaintop/kis_pressure_flow_opacity_option_widget.cpp
M		plugins/paintops/libpaintop/kis_pressure_size_option.cpp
M		plugins/paintops/libpaintop/tests/kis_embedded_pattern_manager_test.cpp
M		plugins/python/comics_project_management_tools/kritapykrita_comics_project_management_tools.desktop
M		plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
M		plugins/python/palette_docker/palette_docker.py
M		plugins/python/tenscripts/kritapykrita_tenscripts.desktop
M		plugins/tools/basictools/kis_tool_colorpicker.cc
M		plugins/tools/basictools/kis_tool_move.cc
M		plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
M		plugins/tools/defaulttool/defaulttool/DefaultTool.h
M		plugins/tools/defaulttool/referenceimagestool/ToolReferenceImages.cpp
M		plugins/tools/defaulttool/referenceimagestool/ToolReferenceImages.h
M		plugins/tools/karbonplugins/tools/filterEffectTool/FilterEffectResource.cpp
M		plugins/tools/karbonplugins/tools/filterEffectTool/FilterEffectScene.cpp
M		plugins/tools/svgtexttool/SvgTextEditor.cpp
M		plugins/tools/tool_smart_patch/kis_inpaint.cpp
M		plugins/tools/tool_transform2/kis_tool_transform.cc
M		plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp
M		plugins/tools/tool_transform2/tests/test_animated_transform_parameters.cpp