[Bf-blender-cvs] [de9026de6e6] master: ctodata: make stripping the last byte optional
Campbell Barton
noreply at git.blender.org
Fri Feb 15 00:18:39 CET 2019
Commit: de9026de6e62c8df623213a20bf6cde54c6bd842
Author: Campbell Barton
Date: Fri Feb 15 08:39:15 2019 +1100
Branches: master
https://developer.blender.org/rBde9026de6e62c8df623213a20bf6cde54c6bd842
ctodata: make stripping the last byte optional
===================================================================
M release/datafiles/ctodata.py
===================================================================
diff --git a/release/datafiles/ctodata.py b/release/datafiles/ctodata.py
index c5d92ecb544..0471faad565 100755
--- a/release/datafiles/ctodata.py
+++ b/release/datafiles/ctodata.py
@@ -27,25 +27,35 @@
import sys
-if len(sys.argv) < 2:
- sys.stdout.write("Usage: ctodata <c_file>\n")
+argv = sys.argv[:]
+
+strip_byte = False
+if "--strip-byte" in argv:
+ argv.remove("--strip-byte")
+ strip_byte = True
+
+if len(argv) < 2:
+ sys.stdout.write("Usage: ctodata <c_file> [--strip-byte]\n")
sys.exit(1)
-filename = sys.argv[1]
+filename = argv[1]
try:
fpin = open(filename, "r")
except:
- sys.stdout.write("Unable to open input %s\n" % sys.argv[1])
+ sys.stdout.write("Unable to open input %s\n" % argv[1])
sys.exit(1)
data = fpin.read().rsplit("{")[-1].split("}")[0]
data = data.replace(",", " ")
data = data.split()
data = [int(v) for v in data]
-# for some reason all data gets trailing byte
-last = data.pop()
-assert(last == 0)
+
+if strip_byte:
+ # String data gets trailing byte.
+ last = data.pop()
+ assert(last == 0)
+
data = bytes(data)
dname = filename + ".ctodata"
More information about the Bf-blender-cvs
mailing list