Diffusion Krita e771f3fb902f

Merge remote-tracking branch 'origin' into rempt/T379-resource-management
e771f3fb902f
Actions

Authored by rempt on Aug 25 2018, 8:01 AM.

Description

Merge remote-tracking branch 'origin' into rempt/T379-resource-management

Details

Committed

rempt

Aug 25 2018, 8:01 AM

Parents

R37:472eb4dac8ee: Fix forgotten line with setting point properties
R37:a8182ef76b20: Merge remote-tracking branch 'origin' into rempt/T379-resource-management

Branches

Unknown

Tags

Unknown

rempt committed R37:e771f3fb902f: Merge remote-tracking branch 'origin' into rempt/T379-resource-management (authored by rempt).Aug 25 2018, 8:01 AM

Merged Changes

Commit	Author	Details	Committed
472eb4dac8ee	dkazakov	Fix forgotten line with setting point properties	Aug 24 2018
f00de1373a9c	vanyossi	Merge branch 'master' of git://anongit.kde.org/krita	Aug 24 2018
02197ef5d14c	vanyossi	Add missing override	Aug 23 2018
10062e6ebfff	vanyossi	Fix warning: Mark unused variable as unused	Aug 23 2018
502e08d1f6e1	vanyossi	Add missing override	Aug 23 2018
2d306653431c	vanyossi	Fix warnings: Mark unused variable as unused	Aug 23 2018
e2c963c93ef3	vanyossi	Add missing override	Aug 23 2018
3b685b4a824c	vanyossi	Fix warning: struct/class confusion	Aug 23 2018
62e95c2bd6b5	vanyossi	Add missing override	Aug 23 2018
04931e4fc85e	dkazakov	FEATURE: round corners for rectangular tools	Aug 23 2018
58444e98e7a2	dkazakov	FEATURE: auto-smoothing for bezier curve tools	Aug 23 2018
53e07c683f7b	vanyossi	Fix warning: struct/class confusion	Aug 23 2018
bc8416ffe05d	dkazakov	Deactivate global selection when creating a local selection from it	Aug 22 2018
1b23df5da326	dkazakov	Fix warning	Aug 22 2018
40a489ee0b09	dkazakov	FEATURE: Allow to deselect/reselect local selection if it is present	Aug 22 2018
d2147abd9f85	dkazakov	Add forgotten license headers	Aug 22 2018
3801957f88a5	dkazakov	Change action name "Select Opaque" -> "Select Opaque (Replace)"	Aug 22 2018
09ce1d040f3a	dkazakov	Implement Ctrl+click shortcuts for selecting opaque pixels on a layer	Aug 22 2018

Changes (70)

				Path	Packages
	M			krita/kritamenu.action
	M			libs/basicflakes/tools/KoCreatePathTool.cpp
	M			libs/basicflakes/tools/KoCreatePathTool.h
	M			libs/basicflakes/tools/KoCreatePathTool_p.h
	M			libs/flake/commands/KoPathPointTypeCommand.cpp
	M			libs/flake/commands/KoPathPointTypeCommand.h
	M			libs/flake/text/KoSvgTextShape.cpp
	M			libs/image/CMakeLists.txt
	M			libs/image/KisLazyStorage.h
	P			libs/image/KisSelectionTags.h Copied from libs/image/commands/kis_selection_commands.h
	A			libs/image/commands/KisDeselectActiveSelectionCommand.cpp
	P			libs/image/commands/KisDeselectActiveSelectionCommand.h Copied from libs/image/commands/kis_selection_commands.h
	A			libs/image/commands/KisReselectActiveSelectionCommand.cpp
	P			libs/image/commands/KisReselectActiveSelectionCommand.h Copied from libs/image/commands/kis_selection_commands.h
	M			libs/image/commands/kis_deselect_global_selection_command.h
	M			libs/image/commands/kis_reselect_global_selection_command.h
	P			libs/image/commands/kis_selection_commands.h Copied to multiple locations: libs/image/KisSelectionTags.h libs/image/commands/KisDeselectActiveSelectionCommand.h libs/image/commands/KisReselectActiveSelectionCommand.h
	M			libs/image/kis_selection.h
	M			libs/image/kis_updater_context.h
	M			libs/image/tests/scheduler_utils.h
	M			libs/libqml/plugins/kritasketchplugin/models/LayerModel.cpp
	M			libs/pigment/KoColorSpaceRegistry.h
	M			libs/ui/CMakeLists.txt
	M			libs/ui/KisNodeDelegate.cpp
	M			libs/ui/KisNodeDelegate.h
	P			libs/ui/KisSelectionActionsAdapter.cpp Copied from libs/ui/tool/kis_shape_tool_helper.h
	P			libs/ui/KisSelectionActionsAdapter.h Copied from plugins/extensions/colorrange/colorrange.h
	M			libs/ui/actions/kis_selection_action_factories.cpp
	M			libs/ui/forms/wdgrectangleconstraints.ui
	M			libs/ui/kis_config.cc
	M			libs/ui/kis_config.h
	M			libs/ui/kis_mask_manager.cc
	M			libs/ui/kis_node_filter_proxy_model.cpp
	M			libs/ui/kis_node_model.cpp
	M			libs/ui/kis_node_model.h
	M			libs/ui/kis_selection_manager.cc
	M			libs/ui/kis_selection_manager.h
	M			libs/ui/tests/FreehandStrokeBenchmark.cpp
	M			libs/ui/tests/KisFrameCacheStoreTest.cpp
	M			libs/ui/tests/KisPaintOnTransparencyMaskTest.cpp
	M			libs/ui/tests/freehand_stroke_test.cpp
	M			libs/ui/tests/kis_model_index_converter_test.cpp
	M			libs/ui/tests/kis_node_model_test.cpp
	M			libs/ui/tests/kis_node_view_test.cpp
	M			libs/ui/tool/kis_rectangle_constraint_widget.cpp
	M			libs/ui/tool/kis_rectangle_constraint_widget.h
	M			libs/ui/tool/kis_shape_tool_helper.cpp
	P			libs/ui/tool/kis_shape_tool_helper.h Copied to libs/ui/KisSelectionActionsAdapter.cpp
	M			libs/ui/tool/kis_tool.cc
	M			libs/ui/tool/kis_tool.h
	M			libs/ui/tool/kis_tool_ellipse_base.cpp
	M			libs/ui/tool/kis_tool_ellipse_base.h
	M			libs/ui/tool/kis_tool_rectangle_base.cpp
	M			libs/ui/tool/kis_tool_rectangle_base.h
	M			plugins/dockers/defaultdockers/kis_layer_box.cpp
	M			plugins/dockers/defaultdockers/kis_layer_box.h
	M			plugins/extensions/colorrange/colorrange.cc
	P			plugins/extensions/colorrange/colorrange.h Copied to libs/ui/KisSelectionActionsAdapter.h
	M			plugins/flake/pathshapes/rectangle/RectangleShape.cpp
	M			plugins/flake/pathshapes/rectangle/RectangleShapeFactory.cpp
	M			plugins/flake/pathshapes/rectangle/RectangleShapeFactory.h
	M			plugins/tools/basictools/kis_tool_ellipse.cc
	M			plugins/tools/basictools/kis_tool_ellipse.h
	M			plugins/tools/basictools/kis_tool_rectangle.cc
	M			plugins/tools/basictools/kis_tool_rectangle.h
	M			plugins/tools/selectiontools/kis_tool_select_elliptical.cc
	M			plugins/tools/selectiontools/kis_tool_select_elliptical.h
	M			plugins/tools/selectiontools/kis_tool_select_rectangular.cc
	M			plugins/tools/selectiontools/kis_tool_select_rectangular.h
	M			sdk/tests/testutil.h