Commit 3be8d1f8 authored by Rurik Bugdanov's avatar Rurik Bugdanov

merge

parents 465465ee 1443208a
...@@ -938,6 +938,7 @@ X3DOMObject.PointerMarker.prototype._init = function(){ ...@@ -938,6 +938,7 @@ X3DOMObject.PointerMarker.prototype._init = function(){
this._elem = Scene.createMarker(0,0,0,"sliding_sphere"); this._elem = Scene.createMarker(0,0,0,"sliding_sphere");
this._shape = this._elem.find("shape"); this._shape = this._elem.find("shape");
this._shape.attr('isPickable',false);
this._registerEvents(); this._registerEvents();
this._elem.find("switch").attr("whichChoice",-1); this._elem.find("switch").attr("whichChoice",-1);
...@@ -1291,5 +1292,5 @@ X3DOMObject.displayMarkInfo = function(index){ ...@@ -1291,5 +1292,5 @@ X3DOMObject.displayMarkInfo = function(index){
}else{ }else{
ui_showMessage("window-markinfo",msg); ui_showMessage("window-markinfo",msg);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment