0

Merge branch 'devel'

This commit is contained in:
Andrew Brown
2012-03-15 23:36:43 -04:00
16 changed files with 764 additions and 104 deletions

View File

@@ -375,12 +375,11 @@ dir but you forgot to put quotes around the directory, since it contains spaces.
# create our TileSet from this RegionSet
tileset_dir = os.path.abspath(os.path.join(destdir, render_name))
if not os.path.exists(tileset_dir):
os.mkdir(tileset_dir)
# only pass to the TileSet the options it really cares about
render['name'] = render_name # perhaps a hack. This is stored here for the asset manager
tileSetOpts = util.dict_subset(render, ["name", "imgformat", "renderchecks", "rerenderprob", "bgcolor", "imgquality", "optimizeimg", "rendermode", "worldname_orig", "title", "dimension", "changelist"])
tileSetOpts.update({"spawn": w.find_true_spawn()}) # TODO find a better way to do this
tset = tileset.TileSet(rset, assetMrg, tex, tileSetOpts, tileset_dir)
tilesets.append(tset)