Discipline specific Buttons

This happened in E3D3.1.0 to 3.1.7 (our current version) when customizing the menu.

While most of the Structural Buttons (Category 'Structures') show only when the 'STRUCTURES' application is selected, the last Structural Button I added, shows up for all Disciplines. Likewise, the last 5 'Pipe' Buttons show up for all disciplines also. I have gone in and out of E3D, made triple sure I clicked 'Apply' and then 'Okay', when making changes, etc. Is there another process I have to run/do before the Menu system will correctly recognize the 'Discipline'?

Yellow highlites are wrong discipline

Parents Reply Children
No Data