Merge remote-tracking branch 'origin' into rempt/T1625-python-scripting
623dbeb4b6d2
Actions

Authored by rempt on Oct 19 2016, 6:37 PM.

Description

Merge remote-tracking branch 'origin' into rempt/T1625-python-scripting

Details

Committed

rempt

Oct 19 2016, 6:37 PM

Parents

R37:709fd3c2a386: Fix struct/class mismatch
R37:c2f96d1fc6c1: Merge branch 'master' into rempt/T1625-python-scripting

Branches

Unknown

Tags

Unknown

rempt committed R37:623dbeb4b6d2: Merge remote-tracking branch 'origin' into rempt/T1625-python-scripting (authored by rempt).Oct 19 2016, 6:37 PM

Merged Changes

Commit		Author	Details	Committed
709fd3c2a386		gladhorn	Fix struct/class mismatch	Oct 19 2016
1c21da33c09e		gladhorn	Remove unused member: WmfParser::mWinding	Oct 19 2016
f3aab8b0ec4b		gladhorn	Add override keyword to virtuals	Oct 19 2016
2aaa11b1a46e		dkazakov	Fix updates of the shape selection after converting it from shapes	Oct 19 2016
989b681592d5		dkazakov	Fix a hangup and a crash when undoing vector selection creation	Oct 19 2016
46b602ce35c9		dkazakov	Crop selection outline correctly when creating a cropped selection	Oct 19 2016
6b1b59121368		dkazakov	Fix the Rectangular selection tool for cases when the rect is outside image	Oct 19 2016
773b8bf82f4a		dkazakov	Fix local selections to work again	Oct 19 2016
5a751aaafc6b		timotheegiet	disable compression flag	Oct 19 2016
d2bd11094873		rempt	Add a note about the need for the prepared gettext binaries when building a…	Oct 19 2016
9cf0a76bfb77		dkazakov	Fix Wash Mode painting on masks	Oct 19 2016
d094c4eaa9be		rempt	Set the version to 3.0.91, 3.1 beta 2	Oct 19 2016
fba2b8e8affb		rempt	kcrash doesn't build with mingw	Oct 19 2016
0ba5fa87a638		gladhorn	Make KoDerivedResourceConverter::writeToSource safe for nullptr value as…	Oct 18 2016
ad20d9123044		gladhorn	Remove unused member: KoRgbU8InvertColorTransformation::m_colorSpace	Oct 18 2016
99e3595b2154		gladhorn	Use QVariant::toInt() to set int member variable	Oct 18 2016
6e717016a705		gladhorn	Minor cleanup of KisHSVAdjustment::transform	Oct 18 2016
b46e7db264c8		dkazakov	Fix the Predefined Brushes	Oct 18 2016
65f659d786d9		dkazakov	Fix merging multiple layers	Oct 18 2016
aabbafbe2589		dkazakov	Fix marking presets with Dirty mark when changing presets in the editor	Oct 18 2016
e291d4ea6d3a		dkazakov	Fix "Instant Preview" checkbox work correctly on initialization	Oct 18 2016
b4f23d216238		gladhorn	Fix invalid zorder entries in .ui file	Oct 18 2016
0a8e012899a5		gladhorn	Fix uic warning: duplicate name 'label'	Oct 18 2016
3b7b039a4cde		dkazakov	Avoid warnings by weird overrides	Oct 18 2016
b8d1d3f82928		gladhorn	Remove dead code	Oct 18 2016
b92e5f9c93b0		gladhorn	Be more consistent in usage of override keyword	Oct 18 2016
f306bf5ee941	D3066	gladhorn	Remove setting of QT_XCB_NO_EVENT_COMPRESSION env var	Oct 18 2016
5c40c9e0bbc0	D3069	gladhorn	Fix initialization order (-Wreorder)	Oct 18 2016
ddd36ab35aef		gladhorn	Fix crash when Qt is built with assertions	Oct 18 2016
5f179ede32da	D3067	gladhorn	Fix deprecation warnings: QStyleOption*VX	Oct 17 2016
0b5dd6ffbb58		gladhorn	Fix struct/class mis-match	Oct 17 2016
fc9a080fe238		gladhorn	Remove unused private member: m_changeId	Oct 17 2016
a6fde81505b7		dkazakov	Fix unittest	Oct 17 2016
9e96a34f3639		dkazakov	Don't regenerate image frames too much	Oct 17 2016
4ae6ff72311d		dkazakov	Make the frame switch stroke a barrier	Oct 17 2016
7ade2d46b4c7		dkazakov	Fix switching frames when painting at the same time	Oct 17 2016
7870f4f46c06		dkazakov	Fix KisImageAnimationInterfaceTest::testSwitchFrameWithUndo	Oct 17 2016
bb8ac537d077		dkazakov	Fix crashes in KisImageAnimationInterfaceTest	Oct 17 2016
81cbac4bc887		rempt	Simplify overriding the display for windows	Oct 15 2016
edda7d76bbfb		rempt	BUG:370896 Don't crash on cancelling import layer	Oct 15 2016
4650224fcad5		rempt	Remove some unused code	Oct 14 2016
8e212571b54b		rempt	Add some extra diagnostic debug on loading wintab32.dll	Oct 14 2016
62c4b49ba987		rempt	BUG:369480 Make the toggle-to-previous-preset action work again	Oct 14 2016

Changes (226)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			3rdparty/README.md
	M			CMakeLists.txt
	M			krita/main.cc
	M			libs/brush/kis_brush_server.cpp
	M			libs/brush/kis_imagepipe_brush.cpp
	M			libs/brush/kis_text_brush.cpp
	M			libs/flake/KoDerivedResourceConverter.cpp
	M			libs/flake/KoOdfGradientBackground.cpp
	M			libs/flake/KoPatternBackground.cpp
	M			libs/flake/KoShapeGroup.cpp
	M			libs/flake/KoSnapGuide.h
	M			libs/flake/commands/KoShapeUnclipCommand.cpp
	M			libs/flake/svg/KoShapePainter.cpp
	M			libs/flake/svg/SvgCssHelper.cpp
	M			libs/flake/tests/TestResourceManager.cpp
	M			libs/flake/tests/TestShapePainting.cpp
	M			libs/image/CMakeLists.txt
	M			libs/image/brushengine/kis_locked_properties_proxy.cpp
	M			libs/image/brushengine/kis_paintop_config_widget.cpp
	M			libs/image/brushengine/kis_paintop_config_widget.h
	M			libs/image/brushengine/kis_paintop_preset.cpp
	M			libs/image/brushengine/kis_paintop_preset.h
	M			libs/image/brushengine/kis_paintop_settings_update_proxy.cpp
	M			libs/image/brushengine/kis_paintop_settings_update_proxy.h
	M			libs/image/commands_new/kis_image_set_resolution_command.cpp
	M			libs/image/commands_new/kis_switch_current_time_command.cpp
	M			libs/image/commands_new/kis_switch_current_time_command.h
	M			libs/image/kis_async_merger.cpp
	M			libs/image/kis_base_node.cpp
	M			libs/image/kis_base_node.h
	M			libs/image/kis_base_processor.cpp
	M			libs/image/kis_gradient_painter.cc
	M			libs/image/kis_group_layer.cc
	M			libs/image/kis_group_layer.h
	M			libs/image/kis_image.h
	M			libs/image/kis_image_animation_interface.cpp
	M			libs/image/kis_image_animation_interface.h
	M			libs/image/kis_indirect_painting_support.h
	M			libs/image/kis_layer.cc
	M			libs/image/kis_layer.h
	M			libs/image/kis_layer_composition.cpp
	M			libs/image/kis_layer_utils.cpp
	M			libs/image/kis_mask.cc
	M			libs/image/kis_mask.h
	M			libs/image/kis_paint_device.cc
	M			libs/image/kis_paint_layer.cc
	M			libs/image/kis_paint_layer.h
	M			libs/image/kis_processing_applicator.cpp
	M			libs/image/kis_regenerate_frame_stroke_strategy.cpp
	M			libs/image/kis_scalar_keyframe_channel.cpp
	M			libs/image/kis_selection_based_layer.cpp
	M			libs/image/kis_selection_based_layer.h
	M			libs/image/kis_simple_stroke_strategy.cpp
	M			libs/image/kis_suspend_projection_updates_stroke_strategy.cpp
	A			libs/image/kis_switch_time_stroke_strategy.cpp
	A			libs/image/kis_switch_time_stroke_strategy.h
	M			libs/image/kis_types.h
	M			libs/image/lazybrush/kis_colorize_mask.cpp
	M			libs/image/lazybrush/kis_colorize_mask.h
	M			libs/image/tests/kis_base_node_test.cpp
	P			libs/image/tests/kis_count_visitor_test.h Copied from libs/image/tests/kis_node_facade_test.h
	M			libs/image/tests/kis_filter_config_widget_test.cpp
	M			libs/image/tests/kis_filter_test.cpp
	M			libs/image/tests/kis_image_animation_interface_test.cpp
	M			libs/image/tests/kis_image_animation_interface_test.h
	M			libs/image/tests/kis_image_test.cpp
	M			libs/image/tests/kis_iterator_test.cpp
	M			libs/image/tests/kis_macro_test.cpp
	M			libs/image/tests/kis_mask_test.cpp
	P			libs/image/tests/kis_node_facade_test.h Copied to multiple locations: libs/image/tests/kis_count_visitor_test.h sdk/tests/testing_nodes.h
	M			libs/image/tests/kis_node_graph_listener_test.h
	M			libs/image/tests/kis_node_test.cpp
	M			libs/image/tests/kis_node_test.h
	M			libs/image/tests/kis_node_visitor_test.cpp
	M			libs/image/tests/kis_paint_device_test.cpp
	M			libs/image/tests/kis_paintop_test.cpp
	M			libs/image/tests/kis_recorded_action_test.cpp
	M			libs/image/tests/kis_simple_stroke_strategy_test.cpp
	M			libs/image/tests/kis_stroke_strategy_undo_command_based_test.cpp
	M			libs/image/tests/kis_update_scheduler_test.cpp
	M			libs/image/tests/kis_updater_context_test.cpp
	M			libs/image/tests/kis_walkers_test.cpp
	M			libs/image/tiles3/tests/kis_lockless_stack_test.cpp
	M			libs/image/tiles3/tests/kis_low_memory_tests.cpp
	M			libs/image/tiles3/tests/kis_memory_pool_test.cpp
	M			libs/image/tiles3/tests/kis_tiled_data_manager_test.cpp
	M			libs/pigment/KoColorConversionAlphaTransformation.cpp
	M			libs/pigment/colorspaces/KoAlphaColorSpace.cpp
	M			libs/pigment/colorspaces/KoSimpleColorSpaceEngine.cpp
	M			libs/pigment/tests/TestFallBackColorTransformation.cpp
	M			libs/psd/asl/kis_asl_xml_parser.cpp
	M			libs/store/KoXmlReader.cpp
	M			libs/store/tests/storedroptest.cpp
	M			libs/ui/KisAutoSaveRecoveryDialog.cpp
	M			libs/ui/KisColorsetChooser.cpp
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisNodeDelegate.cpp
	M			libs/ui/KisNodeDelegate.h
	M			libs/ui/KisOpenPane.cpp
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/actions/kis_selection_action_factories.cpp
	M			libs/ui/canvas/kis_display_color_converter.cpp
	M			libs/ui/dialogs/kis_dlg_import_image_sequence.cpp
	M			libs/ui/flake/kis_shape_layer.cc
	M			libs/ui/flake/kis_shape_layer.h
	M			libs/ui/flake/kis_shape_selection_model.cpp
	M			libs/ui/flake/kis_shape_selection_model.h
	M			libs/ui/input/wintab/kis_tablet_support_win.cpp
	M			libs/ui/kis_canvas_resource_provider.h
	M			libs/ui/kis_categorized_item_delegate.cpp
	M			libs/ui/kis_filters_model.cc
	M			libs/ui/kis_multinode_property.cpp
	M			libs/ui/kis_node_juggler_compressed.cpp
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/kis_paintop_box.h
	M			libs/ui/kis_paintop_settings_widget.cpp
	M			libs/ui/kis_png_converter.cpp
	M			libs/ui/kis_popup_palette.cpp
	M			libs/ui/kis_zoom_manager.cc
	M			libs/ui/operations/kis_filter_selection_operation.cpp
	M			libs/ui/tests/filter_stroke_test.cpp
	M			libs/ui/tests/freehand_stroke_test.cpp
	M			libs/ui/tool/kis_resources_snapshot.cpp
	M			libs/ui/tool/kis_selection_tool_helper.cpp
	M			libs/ui/tool/kis_selection_tool_helper.h
	M			libs/ui/widgets/kis_color_filter_combo.cpp
	M			libs/ui/widgets/kis_filter_selector_widget.cc
	M			libs/ui/widgets/kis_paintop_presets_popup.cpp
	M			libs/ui/widgets/kis_paintop_presets_popup.h
	M			libs/ui/widgets/kis_preset_chooser.cpp
	M			libs/ui/widgets/kis_scratch_pad.cpp
	M			libs/ui/widgets/kis_workspace_chooser.cpp
	M			libs/vectorimage/libwmf/WmfParser.h
	M			libs/widgets/KoDockWidgetTitleBar.cpp
	M			libs/widgets/KoDocumentInfoDlg.cpp
	M			libs/widgets/KoPageLayoutWidget.ui
	M			libs/widgets/KoPositionSelector.cpp
	M			libs/widgets/KoResourceItemChooser.cpp
	M			libs/widgets/KoResourceServerProvider.cpp
	M			libs/widgets/KoStrokeConfigWidget.cpp
	M			libs/widgetutils/kis_action_registry.cpp
	M			libs/widgetutils/xmlgui/kmainwindow.cpp
	M			plugins/color/colorspaceextensions/kis_burnhighlights_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_burnmidtones_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_burnshadows_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_color_balance_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_desaturate_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_dodgehighlights_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_dodgemidtones_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_dodgeshadows_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_hsv_adjustment.cpp
	M			plugins/color/lcms2engine/IccColorSpaceEngine.cpp
	M			plugins/color/lcms2engine/colorspaces/rgb_u8/RgbU8ColorSpace.cpp
	M			plugins/dockers/advancedcolorselector/colorselectorng.cpp
	M			plugins/dockers/advancedcolorselector/kis_color_selector_base.cpp
	M			plugins/dockers/advancedcolorselector/kis_color_selector_combo_box.cpp
	M			plugins/dockers/advancedcolorselector/wdg_color_selector_settings.ui
	M			plugins/dockers/animation/animation_docker.cpp
	M			plugins/dockers/animation/animation_dockers.cpp
	M			plugins/dockers/animation/kis_animation_curve_channel_list_model.cpp
	M			plugins/dockers/animation/kis_animation_curves_value_ruler.cpp
	M			plugins/dockers/animation/kis_equalizer_button.cpp
	M			plugins/dockers/animation/kis_equalizer_slider.cpp
	M			plugins/dockers/animation/kis_time_based_item_model.cpp
	M			plugins/dockers/animation/tests/timeline_model_test.cpp
	M			plugins/dockers/animation/timeline_docker.cpp
	M			plugins/dockers/animation/timeline_frames_view.cpp
	M			plugins/dockers/animation/timeline_ruler_header.cpp
	M			plugins/dockers/artisticcolorselector/artisticcolorselector_plugin.cpp
	M			plugins/dockers/artisticcolorselector/kis_color.cpp
	M			plugins/dockers/channeldocker/channeldocker.cpp
	M			plugins/dockers/colorslider/kis_color_slider.cpp
	M			plugins/dockers/compositiondocker/compositiondocker.cpp
	M			plugins/dockers/defaultdockers/kis_layer_box.cpp
	M			plugins/dockers/digitalmixer/digitalmixer.cc
	M			plugins/dockers/digitalmixer/digitalmixer_dock.cc
	M			plugins/dockers/griddocker/griddocker.cpp
	M			plugins/dockers/histogram/histogramdocker.cpp
	M			plugins/dockers/historydocker/History.cpp
	M			plugins/dockers/imagedocker/imagedocker.cpp
	M			plugins/dockers/imagedocker/imagedocker_dock.cpp
	M			plugins/dockers/lut/lutdocker.cpp
	M			plugins/dockers/overview/overviewdocker.cpp
	M			plugins/dockers/palettedocker/palettedocker.cpp
	M			plugins/dockers/patterndocker/patterndocker.cpp
	M			plugins/dockers/presetdocker/presetdocker.cpp
	M			plugins/dockers/presethistory/presethistory.cpp
	M			plugins/dockers/shapedockers/shapecollection/ShapeCollectionDocker.cpp
	M			plugins/dockers/smallcolorselector/smallcolorselector.cc
	M			plugins/dockers/specificcolorselector/specificcolorselector.cc
	M			plugins/dockers/tasksetdocker/tasksetdocker.cpp
	M			plugins/dockers/tasksetdocker/tasksetdocker_dock.cpp
	M			plugins/extensions/bigbrother/bigbrother.cc
	M			plugins/extensions/gmic/CMakeLists.txt
	M			plugins/extensions/gmic/kis_gmic_simple_convertor.cpp
	M			plugins/extensions/gmic/kis_html_delegate.cpp
	M			plugins/filters/wavefilter/wavefilter.cpp
	M			plugins/flake/textshape/TextTool.cpp
	M			plugins/flake/textshape/dialogs/QuickTableButton.cpp
	M			plugins/flake/textshape/dialogs/SectionFormatDialog.cpp
	M			plugins/flake/textshape/dialogs/StylesCombo.cpp
	M			plugins/flake/textshape/dialogs/StylesDelegate.cpp
	M			plugins/flake/textshape/kotext/KoTextBlockData.cpp
	M			plugins/flake/textshape/kotext/KoTextEditor.cpp
	M			plugins/flake/textshape/kotext/KoTextEditor_format.cpp
	M			plugins/flake/textshape/kotext/KoTextEditor_undo.cpp
	M			plugins/flake/textshape/kotext/KoVariable.cpp
	M			plugins/flake/textshape/kotext/commands/DeleteCommand.cpp
	M			plugins/flake/textshape/kotext/commands/DeleteTableColumnCommand.h
	M			plugins/flake/textshape/kotext/commands/ParagraphFormattingCommand.cpp
	M			plugins/flake/textshape/textlayout/KoTextShapeData.cpp
	M			plugins/impex/exr/exr_converter.cc
	M			plugins/impex/ppm/kis_ppm_export.cpp
	M			plugins/impex/ppm/kis_ppm_import.cpp
	M			plugins/paintops/defaultpaintops/brush/tests/kis_brushop_test.cpp
	M			plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.cpp
	M			plugins/paintops/libpaintop/kis_brush_chooser.cpp
	M			plugins/paintops/libpaintop/kis_color_source.h
	M			plugins/tools/basictools/tests/move_stroke_test.cpp
	M			plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
	M			plugins/tools/selectiontools/kis_tool_select_rectangular.cc
	M			plugins/tools/tool_dyna/kis_tool_dyna.cpp
	P			sdk/tests/testing_nodes.h Copied from libs/image/tests/kis_node_facade_test.h
	M			sdk/tests/testutil.cpp
	M			sdk/tests/testutil.h