Material: Material editor enhancements #11138
Merged
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
|
Are the .vscode/ files included in this PR relevant to the PR too ? |
This was referenced Oct 22, 2023
No. That's .gitignore not .gitignoring. I'll fix that. |
chennes
approved these changes
Oct 23, 2023
Continues the work of the material subsystem improvements. This merge covers the continued development of the material editor. The primary improvements are in the handling of 2D and 3D array properties. These properties are now fully editable, and can be saved and restored. The cards now separate the author and license. These were previously saved as a single item. Future support will be provided for standard open source licenses. Saving operations validate the cards to ensure UUIDs of materials are considered. Warnings are given when a save could potentially impact the models, such as saving over a material instead of creating a new instance. The editor is still not complete. There are a number of functional elements, such as drag/drop operations, folder creation, and deletion operations that need to be added to the main tree. State needs to be saved and restored to improve the user experience. The appearance preview also needs significant work. This will be handled in a future PR.
davesrocketshop
force-pushed
the
material_editor_pr
branch
from
62433b2
to
b3ab6c1
Compare
for more information, see https://pre-commit.ci
Continues the work of the material subsystem improvements. This merge covers the continued development of the material editor. The primary improvements are in the handling of 2D and 3D array properties. These properties are now fully editable, and can be saved and restored. The cards now separate the author and license. These were previously saved as a single item. Future support will be provided for standard open source licenses. Saving operations validate the cards to ensure UUIDs of materials are considered. Warnings are given when a save could potentially impact the models, such as saving over a material instead of creating a new instance. The editor is still not complete. There are a number of functional elements, such as drag/drop operations, folder creation, and deletion operations that need to be added to the main tree. State needs to be saved and restored to improve the user experience. The appearance preview also needs significant work. This will be handled in a future PR.
…op/FreeCAD into material_editor_pr
for more information, see https://pre-commit.ci
…direction Path: fix Profile open edges not respecting selected cutting direction
#include <Inventor/draggers/SoDirectionalLightDragger.h> to PreCompiled.
…-was-not-correctly-finished-in-case-of-a-pre-selection Draft: Draft_SelectPlane was not correctly finished in case of a pre-selection
…setHeadlightEnabled() & isHeadlightEnabled()
Done |
Continues the work of the material subsystem improvements. This merge covers the continued development of the material editor. The primary improvements are in the handling of 2D and 3D array properties. These properties are now fully editable, and can be saved and restored. The cards now separate the author and license. These were previously saved as a single item. Future support will be provided for standard open source licenses. Saving operations validate the cards to ensure UUIDs of materials are considered. Warnings are given when a save could potentially impact the models, such as saving over a material instead of creating a new instance. The editor is still not complete. There are a number of functional elements, such as drag/drop operations, folder creation, and deletion operations that need to be added to the main tree. State needs to be saved and restored to improve the user experience. The appearance preview also needs significant work. This will be handled in a future PR.
for more information, see https://pre-commit.ci
…op/FreeCAD into material_editor_pr
|
There is one thing I would like to know: |
|
I'm not sure. This was an odd merge for me... automatic merge wasn't automatic at all. I'll go back and review |
|
Were there problems outside of src/Mod/Material? |
|
I don't know how those were missed in the merge, but they were automatically merged over. I'll prepare a regression PR |
|
automatic merge meaning using the github ui merge functionality ? |
|
No. Standard git merge. Things that should have been automatic showed as merge conflict, requiring me to manually resolve over 200 files worth. None of the previous changes were shown as options. |
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.
Continues the work of the material subsystem improvements.
This merge covers the continued development of the material editor.
The primary improvements are in the handling of 2D and 3D array properties.
These properties are now fully editable, and can be saved and restored.
The cards now separate the author and license. These were previously saved
as a single item. Future support will be provided for standard open source licenses.
Saving operations validate the cards to ensure UUIDs of materials are considered.
Warnings are given when a save could potentially impact the models, such as
saving over a material instead of creating a new instance.
The editor is still not complete. There are a number of functional elements, such as
drag/drop operations, folder creation, and deletion operations that need to be added
to the main tree. State needs to be saved and restored to improve the user experience.
The appearance preview also needs significant work. This will be handled in a future
PR.