search

InvexGames / MaterialUI

MaterialUI is a UI kit for Unity that follows Google's official material design guidelines.
http://invexgames.com/materialUI.html
Other
771 stars 200 forks source link

Asset Serialization to ForceText? #11

Closed nah0y closed 9 years ago

nah0y commented 9 years ago

Hello,

Just wanted to know if in Edit/Project Settings/Editor you had Asset Serialization set to Force Text? Because it seems that all your prefabs in ComponentPrefabs and the colors such as Editor/01 - Red are binaries (downloading the raw file from github and opening it, we can see that it's binary).

The issue is that opening these in Unity will reserialize everything and git will mark these files as modified :/ If you already have ForceText, maybe it's because I'm working with a different version of Unity? Which one are you using? Thanks!

InvexGames commented 9 years ago

I have mine set to 'mixed', and don't seem to get that.

InvexGames commented 9 years ago

I've set it to 'force text' now, so hopefully you won't get that problem anymore.

nah0y commented 9 years ago

Ah thx! I'm sure this will be better for everybody, force text is much better to merge, compare everything in the project, as it's text and not binary.

You didn't have issue because mine was set to text, so at import Unity was converting them from binary to text.

InvexGames commented 9 years ago

Ah, makes sense then.