| Summary: | Krita merges layers it shouldn't | ||
|---|---|---|---|
| Product: | [Applications] krita | Reporter: | Antti Savolainen <antti.savo> |
| Component: | Layer Stack | Assignee: | Eoin O'Neill <eoinoneill1991> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | halla |
| Priority: | NOR | ||
| Version: | git master (please specify the git hash!) | ||
| Target Milestone: | --- | ||
| Platform: | Other | ||
| OS: | Linux | ||
| Latest Commit: | https://commits.kde.org/krita/a2f1b0cbe30055a7687c21f334310b463cbfbf4f | Version Fixed In: | |
| Sentry Crash Report: | |||
| Attachments: | Krita merges layers example when it shouldn't | ||
|
Description
Antti Savolainen
2018-06-26 20:27:32 UTC
I don't get a crash, but an assert: SAFE ASSERT (krita): "shape" in file /home/boud/dev/krita/libs/ui/kis_node_manager.cpp, line 163 And I can reproduce the rest of the issues. Another one for Dmitry. Created attachment 115497 [details]
Krita merges layers example when it shouldn't
Example file
Git commit a2f1b0cbe30055a7687c21f334310b463cbfbf4f by Eoin O'Neill. Committed on 10/10/2018 at 08:47. Pushed by eoinoneill into branch 'master'. Fixed Merge Multiple 'putAfter' Bug Causing Wrong Layers To Merge Fixed bug where invalid putAfter was causing incorrect nodes to merge when lowest most 'active' node was invisible. M +9 -0 libs/image/kis_layer_utils.cpp https://commits.kde.org/krita/a2f1b0cbe30055a7687c21f334310b463cbfbf4f Git commit c1ab1ee97f196e73d8340918e2d9b7a79eafbbca by Agata Cacko. Committed on 18/11/2020 at 18:45. Pushed by tymond into branch 'master'. Fix assert on New Layer From Visible on invisible active layer Before this commit, Krita would assert on New Layer from Visible when used on invisible layer. This commit fixes this. Explanation: Buckle up, it's going to be a ride :) In 2016 there was a problem that invisible layers would show up when they were merged, see bug 359707. https://bugs.kde.org/show_bug.cgi?id=359707 As a solution, "just remove the layers separately instead of merging" strategy was used. In 2018 it turned out that in case when putAfter (the layer Krita puts the merged result above of) is invisible, it gets removed, so then it's null and Krita tries to merge other layers in instead of putAfter, see bug 395903. https://bugs.kde.org/show_bug.cgi?id=395903 As a solution, if putAfter was invisible, one of the visible nodes-to-be-merged were assigned to putAfter to replace the original putAfter node, to make sure that when original putAfter is removed, some other layer is doing its job. (The fact that it's a soon-to-be-merged layer is not a problem). In 2020 it turned out that there is quite a lot of actions that are possible in locked groups. It required some more changes to the code. See bug 406697. https://bugs.kde.org/show_bug.cgi?id=406697 A solution included a change to the relevant code such that invisible putAfter would be unconditionally replaced with one of the nodes from the to-be-merged list, and then if putAfter had no parent, Krita would encounter an assert. Problem with this behaviour: In case of newLayerFromVisible(), mergedNodes list would only contain a root node (which has no parent). If the putAfter is invisible, then it's replaced with "one of" mergedNodes, which means the root node. Which means it's going to assert. However it's not always necessary to replace putAfter with one of the to-be-merged nodes. It's only needed when it's going to be removed. Hence moving the replacing into the if. Because root is not invisible, the list of invisible nodes will be empty and nothing will be replaced and nothing will be removed. NOTE: I also added a new condition: '&& cleanupNodes'. It's not stricly necessary to cover all usecases of mergeMultipleNodesImpl, because the only usecase where cleanupNodes is false is the newLayerFromVisible case (which will fail the first condition). However it makes it more future-proof since the only case those nodes needs to be removed is when cleanupNodes is true (otherwise removing nodes would be a dataloss bug). NOTE2: It's possible that putAfter replacement needs one more check (to see if it is in fact in the invisibleNodes list). I couldn't find a situation where it was needed, though, so I left it as it is. Related: bug 428683, bug 359707, bug 406697 M +15 -8 libs/image/kis_layer_utils.cpp https://invent.kde.org/graphics/krita/commit/c1ab1ee97f196e73d8340918e2d9b7a79eafbbca Git commit d25e08a3c6298f98850e1f22284f30536425eec1 by Agata Cacko. Committed on 19/11/2020 at 15:49. Pushed by tymond into branch 'krita/4.3'. Fix assert on New Layer From Visible on invisible active layer Before this commit, Krita would assert on New Layer from Visible when used on invisible layer. This commit fixes this. Explanation: Buckle up, it's going to be a ride :) In 2016 there was a problem that invisible layers would show up when they were merged, see bug 359707. https://bugs.kde.org/show_bug.cgi?id=359707 As a solution, "just remove the layers separately instead of merging" strategy was used. In 2018 it turned out that in case when putAfter (the layer Krita puts the merged result above of) is invisible, it gets removed, so then it's null and Krita tries to merge other layers in instead of putAfter, see bug 395903. https://bugs.kde.org/show_bug.cgi?id=395903 As a solution, if putAfter was invisible, one of the visible nodes-to-be-merged were assigned to putAfter to replace the original putAfter node, to make sure that when original putAfter is removed, some other layer is doing its job. (The fact that it's a soon-to-be-merged layer is not a problem). In 2020 it turned out that there is quite a lot of actions that are possible in locked groups. It required some more changes to the code. See bug 406697. https://bugs.kde.org/show_bug.cgi?id=406697 A solution included a change to the relevant code such that invisible putAfter would be unconditionally replaced with one of the nodes from the to-be-merged list, and then if putAfter had no parent, Krita would encounter an assert. Problem with this behaviour: In case of newLayerFromVisible(), mergedNodes list would only contain a root node (which has no parent). If the putAfter is invisible, then it's replaced with "one of" mergedNodes, which means the root node. Which means it's going to assert. However it's not always necessary to replace putAfter with one of the to-be-merged nodes. It's only needed when it's going to be removed. Hence moving the replacing into the if. Because root is not invisible, the list of invisible nodes will be empty and nothing will be replaced and nothing will be removed. NOTE: I also added a new condition: '&& cleanupNodes'. It's not stricly necessary to cover all usecases of mergeMultipleNodesImpl, because the only usecase where cleanupNodes is false is the newLayerFromVisible case (which will fail the first condition). However it makes it more future-proof since the only case those nodes needs to be removed is when cleanupNodes is true (otherwise removing nodes would be a dataloss bug). NOTE2: It's possible that putAfter replacement needs one more check (to see if it is in fact in the invisibleNodes list). I couldn't find a situation where it was needed, though, so I left it as it is. Related: bug 428683, bug 359707, bug 406697 (cherry picked from commit c1ab1ee97f196e73d8340918e2d9b7a79eafbbca) M +15 -8 libs/image/kis_layer_utils.cpp https://invent.kde.org/graphics/krita/commit/d25e08a3c6298f98850e1f22284f30536425eec1 |