This commit is contained in:
1 parent
d77cc6a40e
commit
cc6acb188d
11 files changed
+548
-165
No files matched your search
@@ -297,6 +297,10 @@ fn material_for_entry(
|
||||
parent_material: Option<&MaterialDesc>,
|
||||
material_override: Option<&MaterialOverride>,
|
||||
) -> Handle<StandardMaterial> {
|
||||
if let Some(parent_material) = parent_material {
|
||||
return materials.add(material_from_desc(asset_server, parent_material));
|
||||
}
|
||||
|
||||
if let Some(override_material) = material_override.and_then(|overrides| {
|
||||
overrides
|
||||
.slots
|
||||
@@ -326,10 +330,6 @@ fn material_for_entry(
|
||||
return asset_server.load(labeled_asset_path(&source_path, label));
|
||||
}
|
||||
|
||||
if let Some(parent_material) = parent_material {
|
||||
return materials.add(material_from_desc(asset_server, parent_material));
|
||||
}
|
||||
|
||||
materials.add(StandardMaterial::default())
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user