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

Authored by vanyossi on Jul 12 2018, 12:59 AM.

Description

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

Details

Committed

Jul 12 2018, 12:59 AM

Parents

R37:21afc59cea14: Use Vc Indexes instead of custom SimdArray for integer casting
R37:90cce8644675: Remove obsolete tags file: the tags are part of the bundle

Branches

Unknown

Tags

Unknown

vanyossi committed R37:ebdd1921566c: Merge branch 'master' into ivany/T8580-Brush-AVX-Optim (authored by vanyossi).Jul 12 2018, 12:59 AM

Merged Changes

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

Commit	Author	Details	Committed
90cce8644675	rempt	Remove obsolete tags file: the tags are part of the bundle	Jul 11 2018
4c726301611d	rempt	Hide the color picker button	Jul 11 2018
894046b4ec17	rempt	Merge branch 'rempt/logging-docker'	Jul 11 2018
02ffcef0ed7f	rempt	Remove declaration for unimplemented function	Jul 11 2018
3211c389edac	rempt	A bit of code style cleanup	Jul 11 2018
bb52de46b0cb	rempt	Add *.orig to .gitignore	Jul 10 2018
3462dbffc434	rempt	Fix converting Qt's ui languages to ki18n language codes	Jul 10 2018
5296398dd811	rempt	debug--	Jul 10 2018
468643b66f1f	jounip	Don't pick color from fully transparent reference images	Jul 10 2018
de8d041285d6	rempt	Remove illogical assert	Jul 10 2018
fd325b20d0c8	rempt	Check pointer before dereferencing	Jul 10 2018
3d0e377ca6d5	rempt	Use std::isnan instead of bare isnan	Jul 10 2018
f6fbdd5c8582	rempt	debug--	Jul 10 2018
10fbbe1ffc34	rempt	Use categorized debugging	Jul 10 2018
aa4ca5532307	rempt	remove unused includes	Jul 10 2018
c4a5137d0b97	rempt	debug--	Jul 10 2018
73c8827958be	rempt	Use qInfo for info	Jul 10 2018
e40e9832a462	rempt	debug--	Jul 10 2018
26a052fa57a7	rempt	Use qInfo for info messages	Jul 10 2018
39e2f25b517f	rempt	use categtorized debugging	Jul 10 2018
8dc07b2e141a	rempt	Use qInfo for info output, not qDebug	Jul 10 2018
1624d8f6a9c2	rempt	Use debugFlake instead of plain qDebug	Jul 10 2018
308586659e5f	rempt	Coalesce some krita.lib library debug categories	Jul 10 2018
7f1baa003294	rempt	Use correct debug area	Jul 10 2018
8fda5a43f17e	rempt	use the KisMainWindowObserver interface for the log docker	Jul 10 2018
e25cb758cd2e	rempt	React to theme changes	Jul 10 2018
a207bec380fd	rempt	Make the readonly parameter for Kis(Image)Config explicit	Jul 10 2018
6b376b33d1d7	rempt	Fix debug area for opengl	Jul 10 2018
4998dcb3215c	rempt	Set config to readonly	Jul 10 2018
f6e9cee1d0a9	rempt	Remove useless debug statement	Jul 10 2018
88de0e51c764	rempt	Add read-only parameter to KisConfig	Jul 10 2018
d32efd50074f	rempt	Set KisImageConfig instance to readonly	Jul 10 2018
7e3606826143	rempt	Register QtMsgType so it can be used in a queued sig/slot connection	Jul 10 2018
952e8bf662b3	rempt	Remove KisLoggingManager	Jul 10 2018
aff49e34697e	rempt	Correct some debugging categories	Jul 10 2018
6c3e8b0e9699	rempt	Make logging configurable	Jul 10 2018
5b49b7ac8308	rempt	Merge branch 'master' into rempt/logging-docker	Jul 10 2018
af6febcd63d9	dkazakov	Fix activation of the autosave timer after modify+save+modify cycle	Jul 9 2018
6aa6c744e423	rempt	Switch the lockfree hashtable to on	Jul 9 2018
63b2d5e35406	pino	fixuifiles	Jul 8 2018
ba018ccd2d11	rempt	Implement most of the log docker	Jul 8 2018
06570a5a0f02	rempt	Remove declaration for unimplemented function	Jul 8 2018
b6aa4c3ad750	rempt	Add skeleton for a log viewer docker	Jul 8 2018
735681b9d25c	rempt	A bit of code style cleanup	Jul 8 2018
cb0ea0fb194a	jounip	Fix out-of-range lookups in cross-channel curve filter	Jul 8 2018
cb4cbed1800e	jounip	Fix crash by assert when trying to PgUp into reference images layer	Jul 8 2018
e403fe310d9c	pino	i18n: translate UI message	Jul 7 2018
eac5d9eeb73f	jounip	Fix crash when changing reference image embedding	Jul 7 2018
3929649e6c29	jounip	Fix failure handling when saving reference images	Jul 7 2018
e0cede285cec	jounip	Handle failure to load reference images	Jul 7 2018

Changes (239)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		.gitignore
M		CMakeLists.txt
M		benchmarks/KisAnimationRenderingBenchmark.cpp
M		benchmarks/kis_low_memory_benchmark.cpp
M		krita/data/paintoppresets/CMakeLists.txt
D		krita/data/paintoppresets/kis_paintoppresets_tags.xml
M		krita/main.cc
M		libs/flake/KoCanvasController.h
M		libs/flake/KoCanvasControllerWidget.cpp
M		libs/flake/KoCanvasControllerWidget.h
M		libs/flake/KoCanvasObserverBase.h
M		libs/flake/KoDerivedResourceConverter.cpp
M		libs/flake/KoOdfGradientBackground.cpp
M		libs/flake/KoPathShape.cpp
M		libs/flake/KoRTree.h
M		libs/flake/KoToolBase.cpp
M		libs/flake/resources/KoSvgSymbolCollectionResource.cpp
M		libs/flake/svg/SvgLoadingContext.cpp
M		libs/flake/svg/SvgParser.cpp
M		libs/flake/text/KoSvgTextChunkShape.cpp
M		libs/flake/text/KoSvgTextShape.cpp
M		libs/flake/text/KoSvgTextShapeMarkupConverter.cpp
M		libs/flake/tools/KoPathTool.cpp
M		libs/global/CMakeLists.txt
D		libs/global/KisLoggingManager.cpp
D		libs/global/KisLoggingManager.h
M		libs/global/kis_algebra_2d.cpp
M		libs/global/kis_memory_leak_tracker.cpp
M		libs/image/floodfill/kis_scanline_fill.cpp
M		libs/image/kis_async_merger.cpp
M		libs/image/kis_gauss_rect_mask_generator.cpp
M		libs/image/kis_gaussian_kernel.cpp
M		libs/image/kis_image.cc
M		libs/image/kis_image_config.cpp
M		libs/image/kis_image_config.h
M		libs/image/kis_keyframe.cpp
M		libs/image/kis_layer_utils.cpp
M		libs/image/kis_memory_statistics_server.cpp
M		libs/image/kis_onion_skin_compositor.cpp
M		libs/image/kis_paint_device_debug_utils.cpp
M		libs/image/kis_properties_configuration.cc
M		libs/image/kis_simple_update_queue.cpp
M		libs/image/kis_strokes_queue.cpp
M		libs/image/kis_transform_mask.cpp
M		libs/image/kis_update_scheduler.cpp
M		libs/image/kis_update_time_monitor.cpp
M		libs/image/krita_utils.cpp
M		libs/image/lazybrush/KisWatershedWorker.cpp
M		libs/image/lazybrush/kis_colorize_stroke_strategy.cpp
M		libs/image/lazybrush/kis_lazy_fill_graph.h
M		libs/image/metadata/kis_exif_info_visitor.h
M		libs/image/tests/kis_onion_skin_compositor_test.cpp
M		libs/image/tiles3/kis_tile_data_pooler.cc
M		libs/image/tiles3/kis_tile_hash_table_p.h
M		libs/image/tiles3/swap/kis_chunk_allocator.cpp
M		libs/image/tiles3/swap/kis_chunk_allocator.h
M		libs/image/tiles3/swap/kis_swapped_data_store.cpp
M		libs/image/tiles3/swap/kis_tile_data_swapper_p.h
M		libs/image/tiles3/tests/kis_low_memory_tests.cpp
M		libs/image/tiles3/tests/kis_store_limits_test.cpp
M		libs/image/tiles3/tests/kis_swapped_data_store_test.cpp
M		libs/image/tiles3/tests/kis_tile_data_store_test.cpp
M		libs/libqml/Settings.cpp
M		libs/libqml/plugins/kritasketchplugin/ImageBuilder.cpp
M		libs/odf/KoDocumentInfo.cpp
M		libs/pigment/compositeops/KoOptimizedCompositeOpOver128.h
M		libs/pigment/compositeops/KoStreamedMath.h
M		libs/store/KoZipStore.cpp
M		libs/ui/KisApplication.cpp
M		libs/ui/KisDecorationsManager.cpp
M		libs/ui/KisDocument.cpp
M		libs/ui/KisDocument.h
M		libs/ui/KisFrameDataSerializer.cpp
M		libs/ui/KisImportExportFilter.cpp
M		libs/ui/KisImportExportManager.cpp
M		libs/ui/KisMainWindow.cpp
M		libs/ui/KisNodeDelegate.cpp
M		libs/ui/KisPart.cpp
M		libs/ui/KisPrintJob.cpp
M		libs/ui/KisReferenceImage.cpp
M		libs/ui/KisReferenceImage.h
M		libs/ui/KisView.cpp
M		libs/ui/KisViewManager.cpp
M		libs/ui/brushhud/kis_brush_hud_properties_config.cpp
M		libs/ui/canvas/kis_animation_player.cpp
M		libs/ui/canvas/kis_canvas2.cpp
M		libs/ui/canvas/kis_canvas2.h
M		libs/ui/canvas/kis_canvas_controller.cpp
M		libs/ui/canvas/kis_canvas_controller.h
M		libs/ui/canvas/kis_canvas_widget_base.cpp
M		libs/ui/canvas/kis_coordinates_converter.cpp
M		libs/ui/canvas/kis_display_color_converter.cpp
M		libs/ui/canvas/kis_grid_config.cpp
M		libs/ui/canvas/kis_guides_config.cpp
M		libs/ui/canvas/kis_image_pyramid.cpp
M		libs/ui/canvas/kis_infinity_manager.cpp
M		libs/ui/canvas/kis_prescaled_projection.cpp
M		libs/ui/canvas/kis_qpainter_canvas.cpp
M		libs/ui/canvas/kis_snap_config.cpp
M		libs/ui/dialogs/KisAsyncAnimationRenderDialogBase.cpp
M		libs/ui/dialogs/kis_dlg_adjustment_layer.cc
M		libs/ui/dialogs/kis_dlg_filter.cpp
M		libs/ui/dialogs/kis_dlg_image_properties.cc
M		libs/ui/dialogs/kis_dlg_layer_style.cpp
M		libs/ui/dialogs/kis_dlg_png_import.cpp
M		libs/ui/dialogs/kis_dlg_preferences.cc
M		libs/ui/dialogs/kis_dlg_stroke_selection_properties.cpp
M		libs/ui/input/kis_input_manager.cpp
M		libs/ui/input/kis_input_manager_p.cpp
M		libs/ui/input/kis_input_profile_manager.cpp
M		libs/ui/input/kis_tablet_debugger.cpp
M		libs/ui/input/kis_zoom_action.cpp
M		libs/ui/input/wintab/kis_tablet_support.h
M		libs/ui/kis_animation_cache_populator.cpp
M		libs/ui/kis_animation_frame_cache.cpp
M		libs/ui/kis_clipboard.cc
M		libs/ui/kis_composite_ops_model.cc
M		libs/ui/kis_config.cc
M		libs/ui/kis_config.h
M		libs/ui/kis_favorite_resource_manager.cpp
M		libs/ui/kis_import_catcher.cc
M		libs/ui/kis_mainwindow_observer.h
M		libs/ui/kis_mimedata.cpp
M		libs/ui/kis_node_filter_proxy_model.cpp
M		libs/ui/kis_node_manager.cpp
M		libs/ui/kis_node_manager.h
M		libs/ui/kis_node_model.cpp
M		libs/ui/kis_painting_assistant.cc
M		libs/ui/kis_paintop_box.cc
M		libs/ui/kis_png_converter.cpp
M		libs/ui/kis_popup_palette.cpp
M		libs/ui/kis_selection_decoration.cc
M		libs/ui/opengl/kis_opengl.cpp
M		libs/ui/opengl/kis_opengl_canvas2.cpp
M		libs/ui/opengl/kis_opengl_canvas_debugger.cpp
M		libs/ui/opengl/kis_opengl_image_textures.cpp
M		libs/ui/opengl/kis_texture_tile_update_info.h
M		libs/ui/tests/CMakeLists.txt
A		libs/ui/tests/KisPaintOnTransparencyMaskTest.cpp
A		libs/ui/tests/KisPaintOnTransparencyMaskTest.h
A		libs/ui/tests/data/testing_wet_circle.kpp
M		libs/ui/tests/kis_zoom_and_pan_test.cpp
M		libs/ui/tool/KisStrokeSpeedMonitor.cpp
M		libs/ui/tool/kis_painting_information_builder.cpp
M		libs/ui/tool/kis_selection_tool_helper.cpp
M		libs/ui/tool/kis_smoothing_options.cpp
M		libs/ui/tool/kis_tool_freehand.cc
M		libs/ui/tool/kis_tool_freehand_helper.cpp
M		libs/ui/tool/kis_tool_paint.cc
M		libs/ui/widgets/KoFillConfigWidget.cpp
M		libs/ui/widgets/kis_curve_widget.cpp
M		libs/ui/widgets/kis_custom_image_widget.cc
M		libs/ui/widgets/kis_filter_selector_widget.cc
M		libs/ui/widgets/kis_gradient_chooser.cc
M		libs/ui/widgets/kis_lod_availability_widget.cpp
M		libs/ui/widgets/kis_paintop_presets_chooser_popup.cpp
M		libs/ui/widgets/kis_paintop_presets_popup.cpp
M		libs/ui/widgets/kis_pattern_chooser.cc
M		libs/ui/widgets/kis_preset_chooser.cpp
M		libs/ui/widgets/kis_scratch_pad.cpp
M		libs/ui/widgets/kis_tool_options_popup.cpp
M		libs/ui/widgets/kis_widget_chooser.cpp
M		libs/ui/widgets/kis_workspace_chooser.cpp
M		libs/vectorimage/libemf/EmfHeader.cpp
M		libs/vectorimage/libemf/EmfOutput.cpp
M		libs/vectorimage/libemf/EmfParser.cpp
M		libs/vectorimage/libemf/tests/render.cpp
M		libs/widgetutils/KoFileDialog.h
M		plugins/color/colorspaceextensions/kis_hsv_adjustment.cpp
M		plugins/dockers/CMakeLists.txt
M		plugins/dockers/advancedcolorselector/kis_color_selector_settings.cpp
M		plugins/dockers/animation/animation_docker.cpp
M		plugins/dockers/animation/animation_docker.h
M		plugins/dockers/animation/kis_animation_curve_docker.cpp
M		plugins/dockers/animation/kis_animation_curve_docker.h
M		plugins/dockers/animation/kis_time_based_item_model.cpp
M		plugins/dockers/animation/onion_skins_docker.cpp
M		plugins/dockers/animation/onion_skins_docker.h
M		plugins/dockers/animation/timeline_docker.cpp
M		plugins/dockers/animation/timeline_docker.h
M		plugins/dockers/animation/timeline_frames_view.cpp
M		plugins/dockers/artisticcolorselector/artisticcolorselector_dock.cpp
M		plugins/dockers/artisticcolorselector/artisticcolorselector_dock.h
M		plugins/dockers/artisticcolorselector/kis_color_selector.cpp
M		plugins/dockers/defaultdockers/kis_layer_box.cpp
M		plugins/dockers/defaultdockers/kis_layer_box.h
M		plugins/dockers/griddocker/grid_config_widget.cpp
M		plugins/dockers/historydocker/HistoryDock.cpp
M		plugins/dockers/historydocker/KisUndoView.cpp
A	(dir)	plugins/dockers/logdocker/
A		plugins/dockers/logdocker/CMakeLists.txt
P		plugins/dockers/logdocker/LogDocker.cpp Copied from plugins/dockers/tasksetdocker/tasksetdocker.cpp
P		plugins/dockers/logdocker/LogDocker.h Copied from plugins/dockers/patterndocker/patterndocker_dock.h
A		plugins/dockers/logdocker/LogDockerDock.cpp
A		plugins/dockers/logdocker/LogDockerDock.h
A		plugins/dockers/logdocker/WdgLogDocker.ui
A		plugins/dockers/logdocker/krita_logdocker.json
M		plugins/dockers/lut/lutdocker_dock.cpp
M		plugins/dockers/lut/ocio_display_filter.cpp
M		plugins/dockers/overview/overviewwidget.cc
M		plugins/dockers/palettedocker/palettedocker_dock.cpp
M		plugins/dockers/palettedocker/palettedocker_dock.h
M		plugins/dockers/patterndocker/patterndocker_dock.cpp
P		plugins/dockers/patterndocker/patterndocker_dock.h Copied to plugins/dockers/logdocker/LogDocker.h
M		plugins/dockers/presethistory/presethistory_dock.cpp
M		plugins/dockers/specificcolorselector/specificcolorselector_dock.cc
M		plugins/dockers/specificcolorselector/specificcolorselector_dock.h
M		plugins/dockers/tasksetdocker/CMakeLists.txt
P		plugins/dockers/tasksetdocker/tasksetdocker.cpp Copied to plugins/dockers/logdocker/LogDocker.cpp
M		plugins/dockers/touchdocker/TouchDockerDock.cpp
M		plugins/extensions/animationrenderer/AnimationRenderer.cpp
M		plugins/extensions/animationrenderer/DlgAnimationRenderer.cpp
M		plugins/extensions/colorspaceconversion/colorspaceconversion.cc
M		plugins/extensions/imagesize/dlg_canvassize.cc
M		plugins/extensions/imagesize/dlg_imagesize.cc
M		plugins/extensions/imagesize/dlg_layersize.cc
M		plugins/extensions/imagesplit/wdg_imagesplit.cpp
M		plugins/extensions/layersplit/dlg_layersplit.cpp
M		plugins/extensions/offsetimage/dlg_offsetimage.cpp
M		plugins/extensions/qmic/PluginSettings.cpp
M		plugins/extensions/resourcemanager/dlg_create_bundle.cpp
M		plugins/impex/heightmap/kis_heightmap_import.cpp
M		plugins/impex/libkra/kis_kra_load_visitor.cpp
M		plugins/impex/libkra/kis_kra_loader.cpp
M		plugins/impex/libkra/kis_kra_save_visitor.cpp
M		plugins/impex/svg/kis_svg_import.cc
M		plugins/impex/video/kis_video_export.cpp
M		plugins/paintops/defaultpaintops/brush/kis_brushop.cpp
M		plugins/paintops/libpaintop/kis_brush_chooser.cpp
M		plugins/python/krita_script_starter/bbdkss.ui
M		plugins/tools/basictools/kis_tool_brush.cc
M		plugins/tools/basictools/kis_tool_colorpicker.cc
M		plugins/tools/basictools/kis_tool_colorpicker.h
M		plugins/tools/defaulttool/referenceimagestool/KisReferenceImageCollection.cpp
M		plugins/tools/defaulttool/referenceimagestool/ToolReferenceImages.cpp
M		plugins/tools/selectiontools/kis_selection_modifier_mapper.cc
M		plugins/tools/svgtexttool/SvgTextEditor.cpp
M		sdk/tests/stroke_testing_utils.cpp
M		sdk/tests/stroke_testing_utils.h