mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'zesterer/no-assets' into 'master'
Fixed logic derp See merge request veloren/veloren!771
This commit is contained in:
commit
2d9e60e566
@ -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();
|
||||||
|
@ -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,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user