Skip to content

Commit

Permalink
fix(unity): increase support for unity 2020
Browse files Browse the repository at this point in the history
  • Loading branch information
Whinarn committed Oct 10, 2020
1 parent acb09e8 commit 7a28614
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Editor/LODGeneratorHelperEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -610,12 +610,12 @@ where go.transform.IsChildOf(ourTransform)

var notChildGameObjects = from go in gameObjects
where !go.transform.IsChildOf(ourTransform)
#if UNITY_2018_3 || UNITY_2018_4 || UNITY_2019
#if UNITY_2018_3 || UNITY_2018_4 || UNITY_2019 || UNITY_2020
&& !PrefabUtility.IsPartOfAnyPrefab(go)
#endif
select go;

#if UNITY_2018_3 || UNITY_2018_4 || UNITY_2019
#if UNITY_2018_3 || UNITY_2018_4 || UNITY_2019 || UNITY_2020
var prefabGameObjects = from go in gameObjects
where !go.transform.IsChildOf(ourTransform) &&
PrefabUtility.IsPartOfAnyPrefab(go)
Expand Down
2 changes: 1 addition & 1 deletion Runtime/MeshCombiner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
*/
#endregion

#if UNITY_2017_3 || UNITY_2017_4 || UNITY_2018 || UNITY_2019
#if UNITY_2017_3 || UNITY_2017_4 || UNITY_2018 || UNITY_2019 || UNITY_2020
#define UNITY_MESH_INDEXFORMAT_SUPPORT
#endif

Expand Down
4 changes: 2 additions & 2 deletions Runtime/MeshSimplifier.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
//https://github.com/sp4cerat/Fast-Quadric-Mesh-Simplification
#endregion

#if UNITY_2018_2 || UNITY_2018_3 || UNITY_2018_4 || UNITY_2019
#if UNITY_2018_2 || UNITY_2018_3 || UNITY_2018_4 || UNITY_2019 || UNITY_2020
#define UNITY_8UV_SUPPORT
#endif

#if UNITY_2017_3 || UNITY_2017_4 || UNITY_2018 || UNITY_2019
#if UNITY_2017_3 || UNITY_2017_4 || UNITY_2018 || UNITY_2019 || UNITY_2020
#define UNITY_MESH_INDEXFORMAT_SUPPORT
#endif

Expand Down
4 changes: 2 additions & 2 deletions Runtime/Utility/MeshUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
*/
#endregion

#if UNITY_2018_2 || UNITY_2018_3 || UNITY_2018_4 || UNITY_2019
#if UNITY_2018_2 || UNITY_2018_3 || UNITY_2018_4 || UNITY_2019 || UNITY_2020
#define UNITY_8UV_SUPPORT
#endif

#if UNITY_2017_3 || UNITY_2017_4 || UNITY_2018 || UNITY_2019
#if UNITY_2017_3 || UNITY_2017_4 || UNITY_2018 || UNITY_2019 || UNITY_2020
#define UNITY_MESH_INDEXFORMAT_SUPPORT
#endif

Expand Down
2 changes: 1 addition & 1 deletion Tests/Editor/MeshUtilsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
*/
#endregion

#if UNITY_2017_3 || UNITY_2017_4 || UNITY_2018 || UNITY_2019
#if UNITY_2017_3 || UNITY_2017_4 || UNITY_2018 || UNITY_2019 || UNITY_2020
#define UNITY_MESH_INDEXFORMAT_SUPPORT
#endif

Expand Down

0 comments on commit 7a28614

Please sign in to comment.