Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zesterer/no-assets' into 'master'

Browse Source 
Fixed logic derp

See merge request veloren/veloren!771
This commit is contained in:
Joshua Barretto 2020-01-28 01:13:23 +00:00
commit 2d9e60e566
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/build.rs
View File

@ -36,7 +36,7 @@ fn main() {
Err(e) => panic!("failed to retrieve current git commit hash: {}", e), Err(e) => panic!("failed to retrieve current git commit hash: {}", e),
} }
// Check if git-lfs is working // Check if git-lfs is working
if std::env::var("DISABLE_GIT_LFS_CHECK").is_err() || cfg!(not(feature = "no-assets")) { if std::env::var("DISABLE_GIT_LFS_CHECK").is_err() && cfg!(not(feature = "no-assets")) {
let asset_path: PathBuf = ["..", "assets", "voxygen", "background", "bg_main.png"] let asset_path: PathBuf = ["..", "assets", "voxygen", "background", "bg_main.png"]
.iter() .iter()
.collect(); .collect();

4
common/src/assets/watch.rs
View File

@ -57,10 +57,6 @@ impl Watcher {
} }
} }
fn handle_event(&mut self, event: Event) { fn handle_event(&mut self, event: Event) {
// Skip notice events
//if let Some(Flag::Notice) = event.flag() {
// return;
//}
if let Event { if let Event {
kind: EventKind::Modify(_), kind: EventKind::Modify(_),
paths, paths,