Diffusion Krita 7d8849fb73d5

Merge branch 'master' into ivany/T8580-Brush-AVX-Optim
7d8849fb73d5
Actions

Authored by vanyossi on Jul 3 2018, 7:09 AM.

Description

Merge branch 'master' into ivany/T8580-Brush-AVX-Optim

Details

Committed

vanyossi

Jul 3 2018, 7:09 AM

Parents

R37:d9dce0b93ca7: Merge branch 'akamakin/T8628-multithreading-optimization'
R37:65adda38f081: Add missing license header

Branches

Unknown

Tags

Unknown

vanyossi committed R37:7d8849fb73d5: Merge branch 'master' into ivany/T8580-Brush-AVX-Optim (authored by vanyossi).Jul 3 2018, 7:09 AM

Merged Changes

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

Commit		Author	Details	Committed
d9dce0b93ca7		lieroz	Merge branch 'akamakin/T8628-multithreading-optimization'	Jul 2 2018
e4c03b2f0912		lieroz	Merge remote-tracking branch 'origin/master' into akamakin/T8628-multithreading…	Jul 2 2018
a95bd277ccbd		lieroz	Merge branch 'master' into akamakin/T8628-multithreading-optimization	Jul 2 2018
219ad29ed82a		lieroz	Removed unused variable.	Jul 2 2018
b4755b74ab4d		lieroz	Fixed code issues and made blocking map to be default one.	Jul 2 2018
20ee61568986		dkazakov	Fix a Dockerfile for the docker developer environment	Jul 2 2018
dfa7cb56fbd8	D13697	tusooaw/dkazakov	Ten Brushes: Allow users to configure whether to enable the "Preset History"…	Jul 1 2018
5f86c598a310	D13796	dkazakov	Fix loading of files with 'Box' transformation filter	Jul 1 2018
73125cb16e0d		lieroz	Added config file for hash table implementation switch.	Jul 1 2018
0ce8ef8d5f3d		l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 1 2018
cdc285b51776		lieroz	Code clean.	Jun 30 2018
24975f889a7a		lieroz	Added compile time switch for hash tables.	Jun 30 2018
0ff58df2b09b		lieroz	Changed QSBR to clean more often. Added sanity checks.	Jun 30 2018
6eb14487139c		rempt	Remove unneeded QT definitions	Jun 30 2018
eb030aa16158		rempt	Fix build error on windows	Jun 30 2018
ba34e750e453		rempt	Fix export so windows build works	Jun 30 2018
a99abe4a3232		rempt	Re-add Invert Selection to the menu	Jun 30 2018
026c5dec9dc7		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 30 2018
b0c70d4c9be9		mzhou	Refactoring to Enable KisPaletteView to Be Used in More Widgets	Jun 30 2018
a8ca98974df7		scottpetrovic	Simplify display of Warp transformation grid	Jun 29 2018
ae2463497d42	D13775	pino	Use KFormat also in performance preferences	Jun 28 2018
bef246fb2f97		dkazakov	Fix copying base files	Jun 28 2018
6ee5e646da16		dkazakov	Fix misprints docker scripts	Jun 28 2018
b91b70d40c15		dkazakov	Update docker build scripts	Jun 28 2018
88d97c3fadbb		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 28 2018
439ea1d84966		mzhou	Modified resizeEvent(QResizeEvent *) in KisPaintOpPresetsPopup so that it…	Jun 27 2018
8ec37504a5f2		mzhou	Updated from origin	Jun 27 2018
6ce029dd97d1		mzhou	Some fix following Boud's suggestions on code review	Jun 27 2018
08742c8548b3		lieroz	Changed hash function. Ref T8874	Jun 27 2018
153ecfbba19e		mzhou	Removed unnecessary member "popupButton" from KisPaintopPresetsPopup	Jun 26 2018
fba564457f58		mzhou	Remove unnecessary includes in KisApplication	Jun 26 2018
46bd76e9536f		mzhou	Fixed text string in KisPaletteView: "Spot Color" -> "Spot color"	Jun 26 2018
7dd8c64611ac		mzhou	Ready to submit the refactor to move palette view into kritawidgets	Jun 26 2018
468f2aa0d23b		mzhou	Changes that can be submitted isolated	Jun 26 2018
905b19717468		rempt/lieroz	Warn the user when using an unsupported version of Windows	Jun 26 2018
5a09524bca16		rempt/lieroz	Hide the color sliders config page	Jun 26 2018
708097954470		rempt/lieroz	debug--	Jun 26 2018
0bedb6b39115		woltherav/lieroz	CPMT: Fix the exporter so it produces clean acbf files.	Jun 26 2018
9e7e0e0cb255		dkazakov/lieroz	Fix initialization of the global assistants color	Jun 26 2018
a4708fcdbf9d	D13437	dkazakov/lieroz	Save global color to KRA file	Jun 26 2018
4f89e03975f9		rempt/lieroz	Update gmic to 2.3.0	Jun 26 2018
0d88587df460	D13703	net147/lieroz	Do not scroll pop-up palette when setting document offset	Jun 26 2018
453a0a5eb6a5	D13682	lsegovia/lieroz	Fix PyKrita library search path for MacOS	Jun 26 2018
8a8541fafbce		pino/lieroz	metadata editor: translate name of config pages	Jun 26 2018
c390bb4a660f		pino/lieroz	metadata editor: add XML PI to metadata editor files	Jun 26 2018
2d54b71a4b94		jounip/lieroz	Fix missing shortcut option for reference tool	Jun 26 2018
11157ddd1ac6	D13689	pino/lieroz	pykrita: expose the real i18n() function	Jun 26 2018
176b18ed689e		pino/lieroz	i18n: use location for strings of palettes/brushes/etc	Jun 26 2018
174a4fd772cb		pino/lieroz	i18n: translate "Restore Default" button in pref dialog	Jun 26 2018
b7e3a433e330		dkazakov/lieroz	Change asserts into normal checks	Jun 26 2018

Changes (145)

		Path
M		CMakeLists.txt
M		build-tools/docker/Dockerfile
M		build-tools/docker/README.md
M		build-tools/docker/bin/bootstrap-deps.sh
A		build-tools/docker/bin/bootstrap-root.sh
A		build-tools/docker/bin/enter
D		build-tools/docker/bin/enter_container
A		build-tools/docker/bin/find_default_container_file.inc
A		build-tools/docker/bin/find_up
A		build-tools/docker/bin/install_nvidia_drivers.sh
A		build-tools/docker/bin/qtcreator
M		build-tools/docker/bin/run_container
A		build-tools/docker/bin/start
A		build-tools/docker/bin/stop
A		build-tools/docker/bin/sudoenter
M		build-tools/docker/default-home/devenv.inc
M		build-tools/docker/default-home/run_cmake.sh
A		config-hash-table-implementaion.h.cmake
M		interfaces/KoGenericRegistry.h
M		krita/data/templates/animation/.directory
M		krita/data/templates/animation/Anim-Jp-EN.desktop
M		krita/data/templates/animation/Anim-Jp-JP.desktop
M		krita/data/templates/comics/a4_waffle_grid.desktop
M		krita/krita4.xmlgui
M		krita/org.kde.krita.appdata.xml
M		libs/global/CMakeLists.txt
V		libs/{global ← ui}/kis_config_notifier.cpp
V		libs/{global ← ui}/kis_config_notifier.h
M		libs/global/kis_shared_ptr.h
A	(dir)	libs/image/3rdparty/lock_free_map/
A		libs/image/3rdparty/lock_free_map/atomic.h
A		libs/image/3rdparty/lock_free_map/concurrent_map.h
A		libs/image/3rdparty/lock_free_map/leapfrog.h
A		libs/image/3rdparty/lock_free_map/map_traits.h
A		libs/image/3rdparty/lock_free_map/qsbr.h
A		libs/image/3rdparty/lock_free_map/simple_job_coordinator.h
M		libs/image/kis_filter_strategy.cc
M		libs/image/kis_warptransform_worker.h
M		libs/image/tiles3/kis_memento_manager.h
A		libs/image/tiles3/kis_tile_hash_table2.h
M		libs/image/tiles3/kis_tiled_data_manager.h
M		libs/pigment/resources/KoColorSetEntry.cpp
M		libs/pigment/resources/KoColorSetEntry.h
M		libs/ui/CMakeLists.txt
M		libs/ui/KisApplication.cpp
V		libs/{ui → widgets}/KisColorsetChooser.cpp
V		libs/{ui → widgets}/KisColorsetChooser.h
V		libs/{ui → widgets}/KisPaletteModel.cpp
V		libs/{ui → widgets}/KisPaletteModel.h
V		libs/{ui/dialogs/kis_dlg_internal_color_selector.cpp → widgets/KisDlgInternalColorSelector.cpp}
V		libs/{ui/dialogs/kis_dlg_internal_color_selector.h → widgets/KisDlgInternalColorSelector.h}
M		libs/ui/dialogs/kis_dlg_preferences.cc
V		libs/{ui/forms/wdgdlginternalcolorselector.ui → widgets/WdgDlgInternalColorSelector.ui}
M		libs/ui/kis_config.cc
M		libs/ui/kis_config.h
V		libs/{ui → global}/kis_config_notifier.cpp
V		libs/{ui → global}/kis_config_notifier.h
M		libs/ui/kis_paintop_box.cc
V		libs/{ui → widgets}/kis_palette_delegate.cpp
P		libs/ui/kis_palette_delegate.h Deleted after being copied to multiple locations: libs/widgets/KisScreenColorPickerBase.cpp libs/widgets/KisScreenColorPickerBase.h libs/widgets/kis_palette_delegate.h
V		libs/{ui → widgets}/kis_palette_view.cpp
V		libs/{ui → widgets}/kis_palette_view.h
V		libs/{ui → }/widgets/KisColorSelectorConfiguration.h
V		libs/ui/widgets/{KisScreenColorPicker.cpp ← kis_screen_color_picker.cpp}
V		libs/ui/widgets/{KisScreenColorPicker.h ← kis_screen_color_picker.h}
V		libs/{ui → }/widgets/KisVisualColorSelector.cpp
V		libs/{ui → }/widgets/KisVisualColorSelector.h
V		libs/{ui → }/widgets/KisVisualColorSelectorShape.cpp
V		libs/{ui → }/widgets/KisVisualColorSelectorShape.h
V		libs/{ui → }/widgets/KisVisualEllipticalSelectorShape.cpp
V		libs/{ui → }/widgets/KisVisualEllipticalSelectorShape.h
V		libs/{ui → }/widgets/KisVisualRectangleSelectorShape.cpp
V		libs/{ui → }/widgets/KisVisualRectangleSelectorShape.h
V		libs/{ui → }/widgets/KisVisualTriangleSelectorShape.cpp
V		libs/{ui → }/widgets/KisVisualTriangleSelectorShape.h
M		libs/ui/widgets/KoDualColorButton.cpp
V		libs/{ui → }/widgets/kis_color_button.cpp
V		libs/{ui → }/widgets/kis_color_button.h
V		libs/{ui → }/widgets/kis_color_input.cpp
V		libs/{ui → }/widgets/kis_color_input.h
M		libs/ui/widgets/kis_iconwidget.h
M		libs/ui/widgets/kis_paintop_presets_popup.cpp
M		libs/ui/widgets/kis_paintop_presets_popup.h
V		libs/{ui → }/widgets/kis_popup_button.cc
V		libs/{ui → }/widgets/kis_popup_button.h
V		libs/ui/widgets/{kis_screen_color_picker.cpp → KisScreenColorPicker.cpp}
V		libs/ui/widgets/{kis_screen_color_picker.h → KisScreenColorPicker.h}
V		libs/{ui → }/widgets/kis_spinbox_color_selector.cpp
V		libs/{ui → }/widgets/kis_spinbox_color_selector.h
M		libs/widgets/CMakeLists.txt
V		libs/{ ← ui}/widgets/KisColorSelectorConfiguration.h
V		libs/{widgets ← ui}/KisColorsetChooser.cpp
V		libs/{widgets ← ui}/KisColorsetChooser.h
V		libs/{widgets/KisDlgInternalColorSelector.cpp ← ui/dialogs/kis_dlg_internal_color_selector.cpp}
V		libs/{widgets/KisDlgInternalColorSelector.h ← ui/dialogs/kis_dlg_internal_color_selector.h}
V		libs/{widgets ← ui}/KisPaletteModel.cpp
V		libs/{widgets ← ui}/KisPaletteModel.h
P		libs/widgets/KisScreenColorPickerBase.cpp Copied from libs/ui/kis_palette_delegate.h
P		libs/widgets/KisScreenColorPickerBase.h Copied from libs/ui/kis_palette_delegate.h
V		libs/{ ← ui}/widgets/KisVisualColorSelector.cpp
V		libs/{ ← ui}/widgets/KisVisualColorSelector.h
V		libs/{ ← ui}/widgets/KisVisualColorSelectorShape.cpp
V		libs/{ ← ui}/widgets/KisVisualColorSelectorShape.h
V		libs/{ ← ui}/widgets/KisVisualEllipticalSelectorShape.cpp
V		libs/{ ← ui}/widgets/KisVisualEllipticalSelectorShape.h
V		libs/{ ← ui}/widgets/KisVisualRectangleSelectorShape.cpp
V		libs/{ ← ui}/widgets/KisVisualRectangleSelectorShape.h
V		libs/{ ← ui}/widgets/KisVisualTriangleSelectorShape.cpp
V		libs/{ ← ui}/widgets/KisVisualTriangleSelectorShape.h
V		libs/{widgets/WdgDlgInternalColorSelector.ui ← ui/forms/wdgdlginternalcolorselector.ui}
V		libs/{ ← ui}/widgets/kis_color_button.cpp
V		libs/{ ← ui}/widgets/kis_color_button.h
V		libs/{ ← ui}/widgets/kis_color_input.cpp
V		libs/{ ← ui}/widgets/kis_color_input.h
V		libs/{widgets ← ui}/kis_palette_delegate.cpp
V		libs/{widgets ← ui}/kis_palette_delegate.h
V		libs/{widgets ← ui}/kis_palette_view.cpp
V		libs/{widgets ← ui}/kis_palette_view.h
V		libs/{ ← ui}/widgets/kis_popup_button.cc
V		libs/{ ← ui}/widgets/kis_popup_button.h
V		libs/{ ← ui}/widgets/kis_spinbox_color_selector.cpp
V		libs/{ ← ui}/widgets/kis_spinbox_color_selector.h
M		plugins/dockers/palettedocker/palettedocker_dock.cpp
M		plugins/dockers/palettedocker/palettedocker_dock.h
M		plugins/paintops/particle/kis_particle_paintop_settings_widget.h
M		plugins/python/colorspace/kritapykrita_colorspace.desktop
M		plugins/python/comics_project_management_tools/kritapykrita_comics_project_management_tools.desktop
M		plugins/python/documenttools/kritapykrita_documenttools.desktop
M		plugins/python/exportlayers/kritapykrita_exportlayers.desktop
M		plugins/python/filtermanager/kritapykrita_filtermanager.desktop
M		plugins/python/highpass/kritapykrita_highpass.desktop
M		plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
M		plugins/python/palette_docker/kritapykrita_palette_docker.desktop
M		plugins/python/quick_settings_docker/kritapykrita_quick_settings_docker.desktop
M		plugins/python/scriptdocker/kritapykrita_scriptdocker.desktop
M		plugins/python/scripter/kritapykrita_scripter.desktop
M		plugins/python/selectionsbagdocker/kritapykrita_selectionsbagdocker.desktop
M		plugins/python/tenbrushes/kritapykrita_tenbrushes.desktop
M		plugins/python/tenbrushes/tenbrushes.py
M		plugins/python/tenbrushes/uitenbrushes.py
M		plugins/python/tenscripts/kritapykrita_tenscripts.desktop
M		plugins/tools/tool_transform2/kis_tool_transform_config_widget.cpp
M		plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp
M		plugins/tools/tool_transform2/tool_transform_args.h
M		plugins/tools/tool_transform2/wdg_tool_transform.ui