Merge branch 'save_ext' into enhanced_viewport_overlay

# Conflicts:
#	src/clear_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2016-12-26 15:35:01 +00:00
143 changed files with 2890 additions and 2113 deletions

View File

@@ -66,6 +66,8 @@ inline bool SlXvIsFeatureMissing(SlXvFeatureIndex feature)
return !SlXvIsFeaturePresent(feature);
}
const char *SlXvGetFeatureName(SlXvFeatureIndex feature);
/**
* sub chunk flags, this is saved as-is
* (XSCF_EXTRA_DATA_PRESENT and XSCF_CHUNK_ID_LIST_PRESENT must only be set by the save code, and read by the load code)