fix CanvasItem.get_global_transform() and CanvasItem.get_local_transform(), closes #4075

2 files changed, 6 insertions, 3 deletions

diff --git a/core/image.cpp b/core/image.cpp
index e7f2694d35..d6ac3f28ea 100644
--- a/core/image.cpp
+++ b/core/image.cpp
@@ -1756,7 +1756,7 @@ Error Image::_decompress_bc() {
 	int rofs=0;
 	int wofs=0;
 
-	print_line("width: "+itos(wd)+" height: "+itos(ht));
+	//print_line("width: "+itos(wd)+" height: "+itos(ht));
 
 	for(int i=0;i<=mm;i++) {
 
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp
index fa9b040d92..eb37634b24 100644
--- a/scene/2d/canvas_item.cpp
+++ b/scene/2d/canvas_item.cpp
@@ -1003,11 +1003,14 @@ InputEvent CanvasItem::make_input_local(const InputEvent& p_event) const {
 
 Vector2 CanvasItem::get_global_mouse_pos() const {
 
-	return get_viewport_transform().affine_inverse().xform(Input::get_singleton()->get_mouse_pos());
+	ERR_FAIL_COND_V(!get_viewport(),Vector2());
+	return get_canvas_transform().affine_inverse().xform( get_viewport()->get_mouse_pos() );
 }
 Vector2 CanvasItem::get_local_mouse_pos() const{
 
-	return (get_viewport_transform() * get_global_transform()).affine_inverse().xform(Input::get_singleton()->get_mouse_pos());
+	ERR_FAIL_COND_V(!get_viewport(),Vector2());
+
+	return get_global_transform().affine_inverse().xform( get_global_mouse_pos() );
 }