diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2017-08-14 22:16:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-14 22:16:39 +0200 |
| commit | 7fc3c51169957f0907a13dd07d4004496e6ebd56 (patch) | |
| tree | cfae1a395557040d4f570211c717a2da0d0c5351 /editor/editor_file_system.cpp | |
| parent | b7571582ed95e1a7530e6b4251d99098e4175cc6 (diff) | |
| parent | 4b0990bf8d9351ee213c6596725c2667ab91d033 (diff) | |
Merge pull request #10339 from bojidar-bg/x-fix-scale-conflict
Rename Light2D::scale to texture_scale, so it doesn't conflict
Diffstat (limited to 'editor/editor_file_system.cpp')
0 files changed, 0 insertions, 0 deletions