Diffusion Krita e9ae3b3308bf

Merge branch 'master' into rempt/T379-resource-management
e9ae3b3308bf
Actions

Authored by rempt on Oct 17 2018, 9:03 AM.

Description

Merge branch 'master' into rempt/T379-resource-management

Details

Committed

rempt

Oct 17 2018, 9:03 AM

Parents

R37:4b52cd525974: Fix build if openexr is not present
R37:a40aa8339d91: Begin connected the database to the resourceserver

Branches

Unknown

Tags

Unknown

rempt committed R37:e9ae3b3308bf: Merge branch 'master' into rempt/T379-resource-management (authored by rempt).Oct 17 2018, 9:03 AM

Merged Changes

Commit		Author	Details	Committed
4b52cd525974		rempt	Fix build if openexr is not present	Oct 17 2018
3aef5274c231		vanyossi	Raise the limit for ImageSize.	Oct 16 2018
6f05272d1bfc	D16207	vanyossi	BUG:398920	Oct 16 2018
e83b4202f714		yurchor	Fix minor EBN issues and typos	Oct 16 2018
af83608fff11	D16067	jounip	Synchronize video to audio when drop frames is enabled	Oct 16 2018

Changes (40)

				Path	Packages
	M			libs/pigment/KoColorSpaceAbstract.h
	M			libs/pigment/KoInvertColorTransformation.h
	M			libs/ui/KisSyncedAudioPlayback.cpp
	M			libs/ui/KisSyncedAudioPlayback.h
	M			libs/ui/canvas/kis_animation_player.cpp
	M			libs/ui/canvas/kis_animation_player.h
	M			libs/ui/dialogs/kis_dlg_adj_layer_props.cc
	M			libs/ui/dialogs/kis_dlg_layer_properties.cc
	M			libs/ui/flake/kis_shape_layer.cc
	M			libs/ui/kis_autogradient.cc
	M			libs/ui/kis_bookmarked_configurations_editor.cc
	M			libs/ui/kis_filter_manager.cc
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/kis_selection_manager.cc
	M			libs/ui/kis_statusbar.cc
	M			libs/ui/kis_zoom_manager.cc
	M			libs/ui/widgets/kis_advanced_color_space_selector.cc
	M			libs/ui/widgets/kis_cmb_composite.cc
	M			libs/ui/widgets/kis_color_space_selector.cc
	M			libs/ui/widgets/kis_filter_selector_widget.cc
	M			libs/ui/widgets/kis_gradient_chooser.cc
	M			libs/ui/widgets/kis_pattern_chooser.cc
	M			libs/widgets/KisPaletteListWidget.cpp
	M			libs/widgets/KisPaletteModel.h
	M			libs/widgets/KoColorPopupAction.cpp
	M			libs/widgets/KoColorSetWidget.cpp
	M			libs/widgets/kis_palette_view.cpp
	M			plugins/assistants/Assistants/kis_assistant_tool.cc
	M			plugins/color/lcms2engine/colorspaces/rgb_u8/RgbU8ColorSpace.cpp
	M			plugins/color/lcms2engine/colorspaces/rgb_u8/RgbU8ColorSpace.h
	M			plugins/dockers/digitalmixer/digitalmixer_dock.cc
	M			plugins/dockers/overview/overviewwidget.cc
	M			plugins/dockers/smallcolorselector/smallcolorselector_dock.cc
	M			plugins/dockers/specificcolorselector/specificcolorselector_dock.cc
	M			plugins/extensions/imagesize/dlg_imagesize.cc
	M			plugins/extensions/imagesize/dlg_imagesize.h
	M			plugins/extensions/imagesize/wdg_imagesize.ui
	M			plugins/impex/video/video_saver.h
	M			plugins/tools/selectiontools/kis_tool_select_contiguous.cc
	M			plugins/tools/tool_transform2/kis_tool_transform.cc