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

merge

parents 465465ee 1443208a

js/x3dom_init.js

+2 −1
Original line number Original line Diff line number Diff line
@@ -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);