Merge branch 'facebook/master' into percentage-feature

2016-12-23 21:14:08 +01:00
parent 878a6c4b08 abad796c44
commit 964a1c6137
18 changed files with 636 additions and 300 deletions
--- a/csharp/tests/Facebook.Yoga/YogaNodeTest.cs
+++ b/csharp/tests/Facebook.Yoga/YogaNodeTest.cs
@@ -228,7 +228,6 @@ namespace Facebook.Yoga
            Assert.AreEqual(100.Px(), node0.MaxHeight);
        }

-#if !UNITY_EDITOR
        private void ForceGC()
        {
            GC.Collect(GC.MaxGeneration);
@@ -356,6 +355,5 @@ namespace Facebook.Yoga
                return MeasureOutput.Make(120, 130);
            });
        }
-#endif
    }
 }