Diffusion Krita 78e24f544a1f

Merge branch 'master' into petrovic/text-tool-ux
78e24f544a1f
Actions

Authored by scottpetrovic on Aug 14 2018, 10:07 PM.

Description

Merge branch 'master' into petrovic/text-tool-ux

Details

Committed

scottpetrovic

Aug 14 2018, 10:07 PM

Parents

R37:e355f47d1bff: Don't allow the text button to drag the whole selection
R37:2f5888233621: Fix showing two nodes when converting to a Filter Mask

Branches

Unknown

Tags

Unknown

scottpetrovic committed R37:78e24f544a1f: Merge branch 'master' into petrovic/text-tool-ux (authored by scottpetrovic).Aug 14 2018, 10:07 PM

Merged Changes

Commit		Author	Details	Committed
2f5888233621		dkazakov	Fix showing two nodes when converting to a Filter Mask	Aug 14 2018
c525fb02fb3a		dkazakov	Automatically avoid conflicts between color labels and system colors	Aug 14 2018
46c27f949e61		dkazakov	Make unit tests' names consistent	Aug 14 2018
30fda40c07eb		rempt	Remove the packagers instructions.	Aug 14 2018
670f72598471		rempt	Add modified() getter to the Document class	Aug 14 2018
824210fb0a1e		dkazakov	Try to disable logging rules more aggressively	Aug 14 2018
ddfc126edc53		rempt	Fix memory management of the Filter's InfoObject	Aug 14 2018
93e6e0730d82		rempt	Make sure we wait for the filter to be done	Aug 14 2018
a95a53a198ff		rempt	Simplify the KoColorSpace api	Aug 14 2018
f17512ca36b9		dkazakov	Fix compilation on Jenkins	Aug 14 2018
0062934b5bdd		dkazakov	Exclude halftone filter from the set of unittests	Aug 14 2018
412fd0199c41		dkazakov	Fix TestChannel	Aug 14 2018
04703aaba0ab		dkazakov	Temporary disable extra debugging output in tests	Aug 14 2018
4ff685396b57		dkazakov	Fix more warnings on Jenkins	Aug 14 2018
7d0f34710de9		scottpetrovic	Make it easier to select lower values on stabilizer sliders	Aug 13 2018
f1452472b944	D13562	dkazakov	Add a workaround for loading broken files with negative frame ids	Aug 13 2018
37386604e19f		dkazakov	Fix saving of the multiple frames insertion/removal options to the config	Aug 13 2018
e54fb7a2173e		rempt	Clarify apidox for Node.position()	Aug 13 2018
f663056c9534		rempt	Eliakin tells me these tests were kind of useless	Aug 13 2018
00285fde12cf		dkazakov	Remove docker environment building tools	Aug 13 2018
ec094919ee3d		dkazakov	Fix a random assert in KisSelectionDecorationTest	Aug 13 2018
5a56847cfc39		dkazakov	Fix a memory access problem in KisExifIO	Aug 13 2018
d939200e712b		dkazakov	Fix a problem of Insert Hold Frames action	Aug 13 2018
616862bfff7f		rempt	Remove outdated line about krita 3	Aug 13 2018
eb073effe958		lieroz	Fixed invalid history tiles due to getTileLazy implementation in lock free hash…	Aug 12 2018
f46a4bb8cd09		rempt	Remove the MSVC option and warn when trying to build with MSVC	Aug 12 2018
6bf6cd1a5f1d		vanyossi	Minor code formatting	Aug 11 2018
495a904c201c		vanyossi	Fix Rectangular Soft mask rendering bug	Aug 11 2018
f6e2ed24867b		jounip	Fix build	Aug 10 2018
5018d4733f3c		jounip	Fix reference image cache update conditions	Aug 9 2018
b7e7442e946f		lieroz	Fixed KisKraSaverTest	Aug 9 2018
572b2ad2868b		lieroz	Fixed errors due to invalid cpy constructor in lock free table.	Aug 9 2018
82cfd3e72f8a		dkazakov	Add an assert to some incomplete code in KisMetaData::Value	Aug 9 2018
fb28227789ab		dkazakov	Fix DockerStylesComboModel::data to return correct value	Aug 9 2018
95da7a601d71		dkazakov	Fix KisMetaData::TypeInfo::hasCorrectType turn correct value	Aug 9 2018
0710ca79d927		dkazakov	Fix GCC warnings about implicit fall-through in switch	Aug 9 2018
abac56c1a80c		dkazakov	Fix GCC warnings about catching by value	Aug 9 2018
ca1b82fa5405		dkazakov	Declare TestSvgText* tests as "broken"	Aug 9 2018
bf3e98285341		dkazakov	Make KisSvgTest more fuzzy	Aug 9 2018
6b490765e7ae		dkazakov	Port DistanceInformationRegistrar into move semantics	Aug 9 2018
81d8404bdb06		dkazakov	Fix KisAdjustmentLayerTest that was broken accidentally	Aug 9 2018

Changes (129)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			3rdparty/CMakeLists.txt
	M			3rdparty/ext_boost/CMakeLists.txt
	M			3rdparty/ext_drmingw/CMakeLists.txt
	M			3rdparty/ext_ffmpeg/CMakeLists.txt
	M			3rdparty/ext_gettext/CMakeLists.txt
	M			3rdparty/ext_giflib/CMakeLists.txt
	M			3rdparty/ext_iconv/CMakeLists.txt
	M			3rdparty/ext_ilmbase/CMakeLists.txt
	M			3rdparty/ext_jpeg/CMakeLists.txt
	M			3rdparty/ext_lcms2/CMakeLists.txt
	M			3rdparty/ext_ocio/CMakeLists.txt
	M			3rdparty/ext_openexr/CMakeLists.txt
	M			README.md
	D			README_PACKAGERS.md
	D			build-tools/docker/.gitignore
	D			build-tools/docker/Dockerfile
	M			build-tools/docker/README.md
	D			build-tools/docker/bin
	D			build-tools/docker/bin/bootstrap-deps.sh
	D			build-tools/docker/bin/bootstrap-root.sh
	D			build-tools/docker/bin/build_image
	D			build-tools/docker/bin/enter
	D			build-tools/docker/bin/find_default_container_file.inc
	D			build-tools/docker/bin/find_up
	D			build-tools/docker/bin/install_nvidia_drivers.sh
	D			build-tools/docker/bin/qtcreator
	D			build-tools/docker/bin/run_container
	D			build-tools/docker/bin/start
	D			build-tools/docker/bin/stop
	D			build-tools/docker/bin/sudoenter
	D			build-tools/docker/default-home
	D			build-tools/docker/default-home/.bash_aliases
	D			build-tools/docker/default-home/devenv.inc
	D			build-tools/docker/default-home/run_cmake.sh
	M			cmake/modules/KritaAddBrokenUnitTest.cmake
	M			libs/brush/tests/CMakeLists.txt
	M			libs/flake/tests/CMakeLists.txt
	M			libs/image/brushengine/kis_paint_information.cc
	M			libs/image/brushengine/kis_paint_information.h
	M			libs/image/filter/kis_filter.cc
	M			libs/image/kis_antialiasing_fade_maker.h
	M			libs/image/kis_base_node.cpp
	M			libs/image/kis_base_rects_walker.h
	M			libs/image/kis_brush_mask_applicator_factories.cpp
	M			libs/image/kis_fixed_paint_device.cpp
	M			libs/image/kis_keyframe_channel.cpp
	M			libs/image/kis_keyframe_channel.h
	M			libs/image/kis_outline_generator.cpp
	M			libs/image/kis_paint_device.cc
	M			libs/image/kis_painter.cc
	M			libs/image/kis_pixel_selection.cpp
	M			libs/image/kis_raster_keyframe_channel.cpp
	M			libs/image/kis_scalar_keyframe_channel.cpp
	M			libs/image/krita_utils.cpp
	M			libs/image/krita_utils.h
	M			libs/image/metadata/kis_meta_data_type_info.cc
	M			libs/image/metadata/kis_meta_data_value.cc
	M			libs/image/tests/CMakeLists.txt
	M			libs/image/tests/kis_adjustment_layer_test.cpp
	M			libs/image/tiles3/KisTiledExtentManager.cpp
	M			libs/image/tiles3/kis_tile_data_interface.h
	M			libs/image/tiles3/kis_tile_data_pooler.h
	M			libs/image/tiles3/kis_tile_hash_table2.h
	M			libs/image/tiles3/swap/kis_chunk_allocator.h
	M			libs/image/tiles3/swap/kis_memory_window.h
	M			libs/image/tiles3/tests/CMakeLists.txt
	M			libs/libkis/Document.cpp
	M			libs/libkis/Document.h
	M			libs/libkis/Filter.cpp
	M			libs/libkis/Node.h
	M			libs/libkis/tests/CMakeLists.txt
	M			libs/libkis/tests/TestChannel.cpp
	M			libs/pigment/KoColor.cpp
	M			libs/pigment/KoColorSpace.cpp
	M			libs/pigment/KoColorSpace.h
	M			libs/store/tests/CMakeLists.txt
	M			libs/ui/KisReferenceImagesDecoration.cpp
	M			libs/ui/kis_mask_manager.cc
	M			libs/ui/kis_mask_manager.h
	M			libs/ui/kis_node_manager.cpp
	M			libs/ui/kis_node_view_color_scheme.cpp
	M			libs/ui/kis_png_converter.cpp
	M			libs/ui/kisexiv2/kis_exif_io.cpp
	M			libs/ui/kisexiv2/kis_exiv2.cpp
	M			libs/ui/tests/CMakeLists.txt
	M			libs/ui/tests/KisPaintOnTransparencyMaskTest.cpp
	M			libs/ui/tests/kis_selection_decoration_test.cpp
	M			libs/widgetutils/tests/CMakeLists.txt
	M			plugins/dockers/animation/kis_time_based_item_model.cpp
	M			plugins/dockers/animation/timeline_frames_model.cpp
	M			plugins/dockers/animation/timeline_frames_view.cpp
	M			plugins/dockers/animation/timeline_frames_view.h
	M			plugins/dockers/animation/timeline_insert_keyframe_dialog.cpp
	M			plugins/dockers/animation/timeline_insert_keyframe_dialog.h
	M			plugins/dockers/lut/tests/CMakeLists.txt
	M			plugins/extensions/metadataeditor/kis_meta_data_model.cpp
	M			plugins/extensions/pykrita/sip/krita/Document.sip
	M			plugins/extensions/pykrita/sip/krita/Filter.sip
	D			plugins/extensions/pykrita/testapi.py
	D			plugins/extensions/pykrita/tests
	D			plugins/extensions/pykrita/tests/__init__.py
	D			plugins/extensions/pykrita/tests/actionTests
	D			plugins/extensions/pykrita/tests/actionTests/__init__.py
	D			plugins/extensions/pykrita/tests/actionTests/action_test.py
	D			plugins/extensions/pykrita/tests/actionTests/extension_test.py
	D			plugins/extensions/pykrita/tests/actionTests/filter_test.py
	D			plugins/extensions/pykrita/tests/actionTests/infoobject_test.py
	D			plugins/extensions/pykrita/tests/basetest.py
	M			plugins/extensions/qmic/tests/CMakeLists.txt
	M			plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp
	M			plugins/filters/tests/kis_all_filter_test.cpp
	M			plugins/flake/textshape/dialogs/DockerStylesComboModel.cpp
	M			plugins/flake/textshape/dialogs/TableOfContentsStyleModel.cpp
	M			plugins/impex/csv/tests/CMakeLists.txt
	M			plugins/impex/exr/tests/CMakeLists.txt
	M			plugins/impex/heightmap/tests/CMakeLists.txt
	M			plugins/impex/jpeg/tests/CMakeLists.txt
	M			plugins/impex/libkra/tests/CMakeLists.txt
	M			plugins/impex/png/tests/CMakeLists.txt
	M			plugins/impex/ppm/tests/CMakeLists.txt
	M			plugins/impex/psd/tests/CMakeLists.txt
	M			plugins/impex/svg/tests/CMakeLists.txt
	M			plugins/impex/svg/tests/kis_svg_test.cpp
	M			plugins/impex/xcf/tests/CMakeLists.txt
	M			plugins/paintops/defaultpaintops/brush/tests/CMakeLists.txt
	M			plugins/tools/basictools/kis_tool_brush.cc
	M			plugins/tools/basictools/tests/CMakeLists.txt
	M			plugins/tools/tool_transform2/kis_transform_args_keyframe_channel.cpp
	M			sdk/tests/kistest.h