Vantha/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix warnings with VS2015 introduced in 800bf0da24

Browse Source 
Reviewed by: @Angen
Differential Revision: https://code.wildfiregames.com/D2394
This was SVN commit r23531.
This commit is contained in:
Stan 2020-03-15 16:13:51 +00:00
parent a251e6cf8c
commit c2afb5cdb6
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2019 Wildfire Games.
/* Copyright (C) 2020 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -170,13 +170,10 @@ static AtObj ConvertToLatestFormat(AtObj in)
if (version == -1)
{
AtObj actor;
AtIter castShadows = in["Object"]["Properties"]["@castshadows"];
// Handle the global actor properties
if (in["Object"]["Properties"]["@autoflatten"] == "1")
actor.add("autoflatten", "");
if (in["Object"]["Properties"]["@castshadows"] == "1")
actor.add("castshadow", "");
if (castShadows.defined() && (*castShadows).getInt() == 1)
actor.set("castshadow", "");
// Things to strip leading strings (for converting filenames, since the
// new format doesn't store the entire path)