Merge branch 'master' into alvin/T7198-win-build-scripts
Description
Description
Details
Details
- Committed
alvinhochun Nov 3 2017, 1:18 PM - Parents
- R37:47d52592fa54: remove some duplicate curve UI code that was from the merge. make texture tab…
R37:ce7ca4ae7e9a: Revamp Windows packaging script - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
47d52592fa54 | scottpetrovic | remove some duplicate curve UI code that was from the merge. make texture tab… | Nov 2 2017 | |||
9562ef726af5 | scottpetrovic | merge multi-threading branch into my branch | Nov 2 2017 | |||
89f7b9e2a971 | D8605 | dkazakov | Merge remote-tracking branch 'origin/kazakov/multithreaded-brushes' | Nov 2 2017 | ||
42bf430932f1 | dkazakov | Fix warnings | Nov 2 2017 | |||
8de3e806e581 | dkazakov | Fix FuzzyStroke, Distance, Time and Fade sensors when used in multithreaded… | Nov 2 2017 | |||
06ea68a92974 | woltherav | Fix preview for color smudge brush. | Nov 2 2017 | |||
9488b5b0e36d | radian | Implement different modes for sensor curves | Nov 2 2017 | |||
465432e82ae8 | rempt | Fix crash in the icon cache on exit | Nov 2 2017 | |||
6f31cf3994ef | dkazakov | Add a comment about dab mirroring | Nov 2 2017 | |||
5c5280cb14ec | dkazakov | Fix a misprint | Nov 2 2017 | |||
46eb9ae70408 | dkazakov | Fix live preview for the multithreaded brush | Nov 1 2017 | |||
c3a1ef807b00 | dkazakov | Merge remote-tracking branch 'origin/master' into kazakov/multithreaded-brushes | Nov 1 2017 | |||
50d326b3e246 | dkazakov | Add a class for checking correctness of concurrent access to image areas | Nov 1 2017 | |||
d93da94864a9 | dkazakov | Fixes two "lost tiles" problems in the multithreaded brush | Nov 1 2017 | |||
d2eb0721fbc0 | scottpetrovic | D8586: show brush size in preset list. Authored by neviril' | Nov 1 2017 | |||
1b1ebc97541b | scottpetrovic | turn brush editor area icons to arrows. moved the edit icon by the brush name | Oct 31 2017 | |||
0b3c86be9a0d | scottpetrovic | Merge branch 'master' into petrovic/brush-editor-ux | Oct 31 2017 | |||
eeeedd6eb31c | dkazakov | Fix imagepipe brushes to support multithreaded mode | Oct 26 2017 | |||
0b311f9e2147 | scottpetrovic | Merge branch 'master' into petrovic/brush-editor-ux | Oct 25 2017 | |||
9480d5c055c1 | scottpetrovic | condense the curve widget spacing to make the whole brush editor smaller | Oct 25 2017 | |||
493e8c27daa5 | dkazakov | Implement a simple benchmark for the threaded brushes | Oct 25 2017 | |||
9671b94f9c96 | dkazakov | Fix the freehand stroke test by increasing the fuzzyness | Oct 25 2017 | |||
559862899e64 | dkazakov | Fix initialization of the resources manager for stroke-based tests | Oct 25 2017 | |||
bb3786bcb3f9 | scottpetrovic | condense a bit of space on the brush editor header | Oct 25 2017 | |||
95825e23084d | scottpetrovic | remove some superfluous borders and margins on brush tip UI | Oct 25 2017 | |||
fbc93f052456 | scottpetrovic | simplify the live brush preview area and remove pan and zoom buttons | Oct 24 2017 | |||
7bff11b69601 | dkazakov | Fix config update problem | Oct 20 2017 | |||
c11fbf6e5a2a | dkazakov | Fix KisDabRenderingQueue and its unittest after the refactoring | Oct 20 2017 | |||
73ee104ce86d | D7896 | dkazakov | Fix initialization of KoColor to use QGlobalStatic | Oct 20 2017 | ||
4461dcaf7814 | dkazakov | Add more comments | Oct 20 2017 | |||
dbb062fb089f | dkazakov | Refactor KisDabRenderingQueue to use shared pointers for jobs instead of copying | Oct 20 2017 | |||
02461e0852a1 | dkazakov | Cache 'lastDabJob' value | Oct 19 2017 | |||
e10883e22863 | dkazakov | Make dab rendering resources not to be shared among the dab jobs | Oct 19 2017 | |||
5bec6444fb31 | dkazakov | Avoid extra deep-copies of dabs when mirroring is active | Oct 18 2017 | |||
2b5e8e61793e | dkazakov | Use KisRandomSource instead of std::random_device | Oct 18 2017 | |||
6f4b8aaf146c | dkazakov | Fix memory leak in KisAirbrushOption | Oct 18 2017 | |||
eaf421ab7e22 | dkazakov | Fix a crash and a hangup caused by threading issues in KisUpdateJobItem | Oct 18 2017 | |||
9797000b6263 | scottpetrovic | Merge branch 'master' into petrovic/brush-editor-ux | Oct 16 2017 | |||
a347e22add00 | scottpetrovic | give layouts to the indvidual texture tabs so they stretch to fill area | Oct 16 2017 | |||
cdba591ee411 | scottpetrovic | clean up text brush tip UI | Oct 16 2017 | |||
9553a1fcf56c | scottpetrovic | reduce the height of the brush editor area. | Oct 16 2017 | |||
3af665d181ad | scottpetrovic | updated a couple variable names to improve readability | Oct 16 2017 | |||
fe609c233ee3 | scottpetrovic | make the texture options in two tab areas | Oct 16 2017 | |||
761d5f1b4f2c | scottpetrovic | move the texture options widget to a UI file in the editor | Oct 16 2017 | |||
67eea20583cc | dkazakov | Implement showing brush performance log on canvas overlay | Oct 16 2017 | |||
de6ff1a62ae7 | dkazakov | Fix connection of Throttling plugin to real image cores | Oct 14 2017 | |||
b6b7ba3c477b | dkazakov | Fix Instant Preview for the threaded version of the brush | Oct 13 2017 | |||
b51d1090f6e0 | dkazakov | Optimize calculation of reference FPS for the brushes | Oct 13 2017 | |||
115a4c3cf50d | dkazakov | Merge remote-tracking branch 'origin/master' into kazakov/multithreaded-brushes | Oct 13 2017 | |||
eb2e49b279a7 | dkazakov | Move all the stroke speed metrics calculation into FreehandStroke | Oct 13 2017 |