Merge branch 'malik/fix/reimport-bed-save' into 'master' (ebe43dec) · Commits · Malik Rafsanjani / IF3210-2023-Unity-JTD

Commit ebe43dec authored 2 years ago by

Malik Rafsanjani

Merge branch 'malik/fix/reimport-bed-save' into 'master'

fix: make bed reappear

See merge request !9

parents 26089531 f62e05df

Branches

1 merge request!9fix: make bed reappear

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Bathtub_Bathtub_AlbedoTransparency.png.meta 10 additions, 24 deletions

...ials/Textures/Bathtub_Bathtub_AlbedoTransparency.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Bathtub_Bathtub_MetallicSmoothness.png.meta 10 additions, 24 deletions

...ials/Textures/Bathtub_Bathtub_MetallicSmoothness.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Bathtub_Bathtub_Normal.png.meta 23 additions, 26 deletions

...e Pack/Materials/Textures/Bathtub_Bathtub_Normal.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Bed_Bed_AlbedoTransparency.png.meta 10 additions, 24 deletions

...ck/Materials/Textures/Bed_Bed_AlbedoTransparency.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Bed_Bed_Normal.png.meta 23 additions, 26 deletions

...Furniture Pack/Materials/Textures/Bed_Bed_Normal.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Bed_Frame_AlbedoTransparency.png.meta 10 additions, 24 deletions

.../Materials/Textures/Bed_Frame_AlbedoTransparency.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Bed_Frame_MetallicSmoothness.png.meta 10 additions, 24 deletions

.../Materials/Textures/Bed_Frame_MetallicSmoothness.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Bed_Frame_Normal.png.meta 23 additions, 26 deletions

...rniture Pack/Materials/Textures/Bed_Frame_Normal.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Dresser_Drawers_AlbedoTransparency.png.meta 10 additions, 20 deletions

...ials/Textures/Dresser_Drawers_AlbedoTransparency.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Dresser_Drawers_MetallicSmoothness.png.meta 10 additions, 20 deletions

...ials/Textures/Dresser_Drawers_MetallicSmoothness.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Dresser_Drawers_Normal.png.meta 23 additions, 22 deletions

...e Pack/Materials/Textures/Dresser_Drawers_Normal.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Dresser_Dresser_AlbedoTransparency.png.meta 10 additions, 20 deletions

...ials/Textures/Dresser_Dresser_AlbedoTransparency.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Dresser_Dresser_MetallicSmoothness.png.meta 10 additions, 20 deletions

...ials/Textures/Dresser_Dresser_MetallicSmoothness.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Dresser_Dresser_Normal.png.meta 23 additions, 22 deletions

...e Pack/Materials/Textures/Dresser_Dresser_Normal.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Footstool_Footstool_AlbedoTransparency.png.meta 10 additions, 20 deletions

.../Textures/Footstool_Footstool_AlbedoTransparency.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Footstool_Footstool_MetallicSmoothness.png.meta 10 additions, 20 deletions

.../Textures/Footstool_Footstool_MetallicSmoothness.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Footstool_Footstool_Normal.png.meta 23 additions, 22 deletions

...ck/Materials/Textures/Footstool_Footstool_Normal.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Lamp_Lamp_AlbedoTransparency.png.meta 10 additions, 24 deletions

.../Materials/Textures/Lamp_Lamp_AlbedoTransparency.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Lamp_Lamp_Emission.png.meta 10 additions, 24 deletions

...iture Pack/Materials/Textures/Lamp_Lamp_Emission.png.meta
Assets/Models/Environment/Bed & Bath Furniture Pack/Materials/Textures/Lamp_Lamp_MetallicSmoothness.png.meta 10 additions, 24 deletions

.../Materials/Textures/Lamp_Lamp_MetallicSmoothness.png.meta

with 278 additions and 456 deletions

Please register or to comment

Admin message

Merge branch 'malik/fix/reimport-bed-save' into 'master'