diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-21 13:07:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-21 13:07:29 +0200 |
| commit | 7d0275785b7582e34f488f7d28554f064168a428 (patch) | |
| tree | 5c03a2a4fd0a61b4bff4aab52773a4e3bafc2686 /platform/iphone/view_controller.mm | |
| parent | 71bbe6eb01d1664340ea624aca36aa47c693981d (diff) | |
| parent | 28b902211ff3c3a1391a2ec85e58803b0df40929 (diff) | |
Merge pull request #27940 from LeonardMeagher2/fix_csgshape_geometryinstance
CSGMesh gets material + CSGShape inherits from GeometryInstance
Diffstat (limited to 'platform/iphone/view_controller.mm')
0 files changed, 0 insertions, 0 deletions