diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-30 14:22:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-30 14:22:29 +0200 |
| commit | e2bbf2cba3dc97998cff0be5cbda2d7e3b7151b0 (patch) | |
| tree | 1784ee303025841edb69093ce9dbddba85933b09 /scene/2d | |
| parent | 82604195b4c2c80777f7ecaa547194c6a208e8cf (diff) | |
| parent | 0db138a621c8ce67864379c2bf69fda54c380178 (diff) | |
Merge pull request #30184 from akien-mga/doc-property-defval
doc: Add default values to all properties
Diffstat (limited to 'scene/2d')
| -rw-r--r-- | scene/2d/cpu_particles_2d.cpp | 2 | ||||
| -rw-r--r-- | scene/2d/line_2d.cpp | 1 | ||||
| -rw-r--r-- | scene/2d/tile_map.cpp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp index faa0a08d10..75315bfc6e 100644 --- a/scene/2d/cpu_particles_2d.cpp +++ b/scene/2d/cpu_particles_2d.cpp @@ -1410,7 +1410,7 @@ CPUParticles2D::CPUParticles2D() { set_emission_sphere_radius(1); set_emission_rect_extents(Vector2(1, 1)); - set_gravity(Vector2(0, 98.8)); + set_gravity(Vector2(0, 98)); for (int i = 0; i < PARAM_MAX; i++) { set_param_randomness(Parameter(i), 0); diff --git a/scene/2d/line_2d.cpp b/scene/2d/line_2d.cpp index 4488dc501c..1c8245d159 100644 --- a/scene/2d/line_2d.cpp +++ b/scene/2d/line_2d.cpp @@ -44,6 +44,7 @@ Line2D::Line2D() { _end_cap_mode = LINE_CAP_NONE; _width = 10; _default_color = Color(0.4, 0.5, 1); + _texture_mode = LINE_TEXTURE_NONE; _sharp_limit = 2.f; _round_precision = 8; } diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index bf59fa0ba8..fc53c9e4ac 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -1829,6 +1829,7 @@ TileMap::TileMap() { half_offset = HALF_OFFSET_DISABLED; use_parent = false; collision_parent = NULL; + use_kinematic = false; navigation = NULL; y_sort_mode = false; occluder_light_mask = 1; |