diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-14 22:20:05 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-15 09:50:27 -0300 |
| commit | a7854d3ae6a81093b1cf23da3dd99b57b1aebc34 (patch) | |
| tree | f9803ca74f71b6725dc7c0c82d7d0c43318f777e /tools/editor/plugins/canvas_item_editor_plugin.cpp | |
| parent | 5e13a762ecbdfe6a643977b74c790d479a0636e2 (diff) | |
| download | redot-engine-a7854d3ae6a81093b1cf23da3dd99b57b1aebc34.tar.gz | |
2D and 3D viewport are working again :D
Diffstat (limited to 'tools/editor/plugins/canvas_item_editor_plugin.cpp')
| -rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index f321a74c7e..53b521f2fa 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -1319,7 +1319,7 @@ void CanvasItemEditor::_viewport_gui_input(const InputEvent& p_event) { { bone_ik_list.clear(); float closest_dist=1e20; - int bone_width = EditorSettings::get_singleton()->get("editors/2dbone_width"); + int bone_width = EditorSettings::get_singleton()->get("editors/2d/bone_width"); for(Map<ObjectID,BoneList>::Element *E=bone_list.front();E;E=E->next()) { if (E->get().from == E->get().to) @@ -2113,11 +2113,11 @@ void CanvasItemEditor::_viewport_draw() { } if (skeleton_show_bones) { - int bone_width = EditorSettings::get_singleton()->get("editors/2dbone_width"); - Color bone_color1 = EditorSettings::get_singleton()->get("editors/2dbone_color1"); - Color bone_color2 = EditorSettings::get_singleton()->get("editors/2dbone_color2"); - Color bone_ik_color = EditorSettings::get_singleton()->get("editors/2dbone_ik_color"); - Color bone_selected_color = EditorSettings::get_singleton()->get("editors/2dbone_selected_color"); + int bone_width = EditorSettings::get_singleton()->get("editors/2d/bone_width"); + Color bone_color1 = EditorSettings::get_singleton()->get("editors/2d/bone_color1"); + Color bone_color2 = EditorSettings::get_singleton()->get("editors/2d/bone_color2"); + Color bone_ik_color = EditorSettings::get_singleton()->get("editors/2d/bone_ik_color"); + Color bone_selected_color = EditorSettings::get_singleton()->get("editors/2d/bone_selected_color"); for(Map<ObjectID,BoneList>::Element*E=bone_list.front();E;E=E->next()) { |