File tree Expand file tree Collapse file tree 2 files changed +9
-1
lines changed
Expand file tree Collapse file tree 2 files changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -7,11 +7,17 @@ Sidebar.Scene = function ( editor ) {
77 container . addStatic ( new UI . Text ( 'SCENE' ) ) ;
88 container . add ( new UI . Break ( ) ) ;
99
10+ var ignoreObjectSelectedSignal = false ;
11+
1012 var outliner = new UI . FancySelect ( ) . setId ( 'outliner' ) ;
1113 outliner . onChange ( function ( ) {
1214
15+ ignoreObjectSelectedSignal = true ;
16+
1317 editor . selectById ( parseInt ( outliner . getValue ( ) ) ) ;
1418
19+ ignoreObjectSelectedSignal = false ;
20+
1521 } ) ;
1622 container . add ( outliner ) ;
1723 container . add ( new UI . Break ( ) ) ;
@@ -194,6 +200,8 @@ Sidebar.Scene = function ( editor ) {
194200
195201 signals . objectSelected . add ( function ( object ) {
196202
203+ if ( ignoreObjectSelectedSignal === true ) return ;
204+
197205 outliner . setValue ( object !== null ? object . id : null ) ;
198206
199207 } ) ;
Original file line number Diff line number Diff line change @@ -495,13 +495,13 @@ UI.FancySelect = function () {
495495 // Highlight selected dom elem and scroll parent if needed
496496 scope . setValue ( scope . options [ scope . selectedIndex ] . value ) ;
497497
498- // Invoke object/helper/mesh selection logic
499498 scope . dom . dispatchEvent ( changeEvent ) ;
500499
501500 }
502501
503502 break ;
504503 }
504+
505505 } , false ) ;
506506
507507 this . dom = dom ;
You can’t perform that action at this time.
0 commit comments