diff options
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/3d/skeleton.cpp | 2 | ||||
| -rw-r--r-- | scene/animation/animation_blend_space_2d.cpp | 3 | ||||
| -rw-r--r-- | scene/gui/color_picker.cpp | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/scene/3d/skeleton.cpp b/scene/3d/skeleton.cpp index 0db2250a3a..8caf4e8e39 100644 --- a/scene/3d/skeleton.cpp +++ b/scene/3d/skeleton.cpp @@ -320,7 +320,7 @@ void Skeleton::_notification(int p_what) { } b.transform_final = b.pose_global * b.rest_global_inverse; - vs->skeleton_bone_set_transform(skeleton, i, global_transform * (b.transform_final * global_transform_inverse)); + vs->skeleton_bone_set_transform(skeleton, order[i], global_transform * (b.transform_final * global_transform_inverse)); for (List<uint32_t>::Element *E = b.nodes_bound.front(); E; E = E->next()) { diff --git a/scene/animation/animation_blend_space_2d.cpp b/scene/animation/animation_blend_space_2d.cpp index d744d6cc8e..1fe14e633b 100644 --- a/scene/animation/animation_blend_space_2d.cpp +++ b/scene/animation/animation_blend_space_2d.cpp @@ -320,7 +320,6 @@ void AnimationNodeBlendSpace2D::_update_triangles() { if (!auto_triangles || !trianges_dirty) return; - print_line("updating triangles"); trianges_dirty = false; triangles.clear(); if (blend_points_used < 3) { @@ -336,8 +335,6 @@ void AnimationNodeBlendSpace2D::_update_triangles() { Vector<Delaunay2D::Triangle> triangles = Delaunay2D::triangulate(points); - print_line("triangles generated: " + itos(triangles.size())); - for (int i = 0; i < triangles.size(); i++) { add_triangle(triangles[i].points[0], triangles[i].points[1], triangles[i].points[2]); } diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index b99128e65f..6ed465562e 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -176,14 +176,15 @@ void ColorPicker::_update_color() { updating = true; for (int i = 0; i < 4; i++) { - scroll[i]->set_step(0.01); if (raw_mode_enabled) { + scroll[i]->set_step(0.01); scroll[i]->set_max(100); if (i == 3) scroll[i]->set_max(1); scroll[i]->set_value(color.components[i]); } else { - const int byte_value = color.components[i] * 255; + scroll[i]->set_step(1); + const float byte_value = color.components[i] * 255.0; scroll[i]->set_max(next_power_of_2(MAX(255, byte_value)) - 1); scroll[i]->set_value(byte_value); } |