When merging .uip files materials with the same id cause issues. The files merge without conflicts but the visual result are messed up.
When I understand correctly new materials get an id like "name_001" "name_002" and so on. When working on the same .uip on different branches, it is most likely to happen that two completely different materials share the same id.
|For Gerrit Dashboard: QT3DS-3816|
|273066,8||Generate unique ids for objects||master||qt3dstudio/qt3dstudio||Status: MERGED||+2||0|
|274064,4||Add fileids for actions and slides||master||qt3dstudio/ogl-runtime||Status: MERGED||+2||0|
|274065,5||Fix generating unique ids for objects||master||qt3dstudio/qt3dstudio||Status: MERGED||+2||0|