diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-04 01:17:41 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-04 01:17:41 -0300 |
| commit | 76c2e8583e70e8c976a306e77a40e8e7226aa249 (patch) | |
| tree | fe260ef3c0d00996d537f2fe3b8c78abfb92aa60 /tools/editor/plugins/material_editor_plugin.cpp | |
| parent | b085c40edfac45ec1c8b866c789f6e9bab7e5e08 (diff) | |
| parent | 3a0c19d3f6ddb26359c95d84c376a8e6b1afd04d (diff) | |
| download | redot-engine-76c2e8583e70e8c976a306e77a40e8e7226aa249.tar.gz | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'tools/editor/plugins/material_editor_plugin.cpp')
| -rw-r--r-- | tools/editor/plugins/material_editor_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/plugins/material_editor_plugin.cpp b/tools/editor/plugins/material_editor_plugin.cpp index 9c279fa967..3ef1818135 100644 --- a/tools/editor/plugins/material_editor_plugin.cpp +++ b/tools/editor/plugins/material_editor_plugin.cpp @@ -129,8 +129,8 @@ MaterialEditor::MaterialEditor() { viewport->add_child(box_instance); Transform box_xform; - box_xform.basis.rotate(Vector3(1,0,0),Math::deg2rad(-25)); - box_xform.basis = box_xform.basis * Matrix3().rotated(Vector3(0,1,0),Math::deg2rad(-25)); + box_xform.basis.rotate(Vector3(1,0,0),Math::deg2rad(25)); + box_xform.basis = box_xform.basis * Matrix3().rotated(Vector3(0,1,0),Math::deg2rad(25)); box_xform.basis.scale(Vector3(0.8,0.8,0.8)); box_instance->set_transform(box_xform); |
