fix shader compilation error and invisible color layers in certain circumstances #4556
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
philippotto
commented
Apr 20, 2020
| ]; | ||
|
|
||
| return enabledLayerNames | ||
| .concat(this.leastRecentlyVisibleLayers) | ||
| const names = enabledLayerNames |
There was a problem hiding this comment.
this change makes debugging a bit easier.
philippotto
commented
Apr 20, 2020
| @@ -224,7 +224,7 @@ class DatasetSettings extends React.PureComponent<DatasetSettingsProps> { | |||
| <span style={{ fontWeight: 700 }}> | |||
| {!isColorLayer && isVolumeTracing ? "Volume Layer" : layerName} | |||
| </span> | |||
| <Tag style={{ cursor: "default", marginLeft: 8 }}>{elementClass} Layer</Tag> | |||
| <Tag style={{ cursor: "default", marginLeft: 8 }}>{elementClass}</Tag> | |||
There was a problem hiding this comment.
I think the Layer label is not really necessary.
daniel-wer
approved these changes
Apr 21, 2020
frontend/javascripts/oxalis/geometries/materials/plane_material_factory.js
Outdated
Show resolved
Hide resolved
frontend/javascripts/oxalis/geometries/materials/plane_material_factory.js
Outdated
Show resolved
Hide resolved
Co-Authored-By: Daniel <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes two bugs (both mentioned in #4553).
One issue was a
===comparison between a boolean and undefined (I thought, the flow linter would warn about this, but unfortunately it doesn't. we disabled sketchy-bool checks because it also warns about a lot of other stuff, which is usually fine for is).The other issue was that the segmentation layer name could slip into the
colorLayerNamesvariable. The reason for this was that the LRU layer could contain the segmentation layer. I made the naming clearer and excluded the segmentation layer from the LRU system (since the shader s always compiled for thesegmentation layer; one could re-think this, but that's outside the scope of this PR imo).URL of deployed dev instance (used for testing):
Steps to test:
I think the case in question doesn't need to be tested again.
Issues: