Normand Briere
2019-08-19 22e8ab6479334206f97b0093f6c5ffd14610cce3
GroupEditor.java
....@@ -29,7 +29,7 @@
2929 {
3030 cButton skyboxButton;
3131 final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
- row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32
+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
3333 //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
3434 skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
3535 skyboxButton.addActionListener(new ActionListener()
....@@ -46,7 +46,7 @@
4646 {
4747 cButton textureButton;
4848 final String path = "textures/" + f + "/" + c + "/"; // + t;
49
- row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
49
+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
5050 textureButton.setToolTipText(c + count);
5151 textureButton.addActionListener(new ActionListener()
5252 {
....@@ -347,7 +347,7 @@
347347
348348 public void CreateSkyboxPanel(cGridBag skyboxPanel)
349349 {
350
- JTabbedPane skyboxpane = new JTabbedPane();
350
+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
351351
352352 AddSkyboxTab0(skyboxpane);
353353 AddSkyboxTab1(skyboxpane);
....@@ -857,9 +857,9 @@
857857 hideleavesItem.addActionListener(this);
858858 showleavesItem = menu.add(new MenuItem("Show Leaves"));
859859 showleavesItem.addActionListener(this);
860
- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
860
+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
861861 markleavesItem.addActionListener(this);
862
- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
862
+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
863863 unmarkleavesItem.addActionListener(this);
864864 rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
865865 rewindleavesItem.addActionListener(this);
....@@ -1038,9 +1038,9 @@
10381038 oe.radioPanel.add(dummyButton);
10391039 oe.buttonGroup.add(dummyButton);
10401040 */
1041
- cGridBag copyOptionsPanel = new cGridBag();
1041
+ cGridBag versionManagerPanel = new cGridBag();
10421042
1043
- copyOptionsPanel.preferredHeight = 2;
1043
+ versionManagerPanel.preferredHeight = 4;
10441044
10451045 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
10461046
....@@ -1067,25 +1067,25 @@
10671067 // }
10681068 // });
10691069
1070
- oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1070
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10711071 collapseButton.setToolTipText("Collapse toolbar");
10721072 collapseButton.addActionListener(this);
10731073
1074
- oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1074
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10751075 maximize3DButton.setToolTipText("Maximize 3D view");
10761076 maximize3DButton.addActionListener(this);
10771077
1078
- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1078
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10791079 twoButton.setToolTipText("Show 3D view only");
10801080 twoButton.addActionListener(this);
10811081 this.fullscreenLayout = twoButton;
10821082
1083
- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1083
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10841084 threeButton.setToolTipText("Show controls and 3D view");
10851085 threeButton.addActionListener(this);
10861086 if (Globals.ADVANCED)
10871087 {
1088
- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1088
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10891089 sixButton.setToolTipText("Show 3D view and controls");
10901090 sixButton.addActionListener(this);
10911091 }
....@@ -1094,51 +1094,51 @@
10941094 // sevenButton.addActionListener(this);
10951095 //
10961096
1097
- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1097
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10981098 fullButton.setToolTipText("Full-screen window");
10991099 fullButton.addActionListener(this);
11001100
1101
- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1101
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11021102 screenfitButton.setToolTipText("Screen fit");
11031103 screenfitButton.addActionListener(this);
11041104
1105
- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1105
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11061106 restoreCameraButton.setToolTipText("Restore viewpoint");
11071107 restoreCameraButton.addActionListener(this);
11081108
1109
- copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1109
+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11101110 saveVersionButton.setToolTipText("Duplicate current version");
11111111 saveVersionButton.addActionListener(this);
11121112
1113
- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113
+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11141114 deleteVersionButton.setToolTipText("Delete current version");
11151115 deleteVersionButton.addActionListener(this);
11161116 deleteVersionButton.setEnabled(false);
11171117
1118
- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11191119 previousVersionButton.setToolTipText("Previous version");
11201120 previousVersionButton.addActionListener(this);
11211121 previousVersionButton.setEnabled(false);
11221122
11231123 cGridBag updown = new cGridBag().setVertical(true);
1124
- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124
+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11251125 restoreButton.setToolTipText("Undo (restore current version)");
11261126 restoreButton.addActionListener(this);
11271127 restoreButton.setEnabled(false);
11281128
1129
- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11301130 replaceButton.setToolTipText("Save (replace current version)");
11311131 replaceButton.addActionListener(this);
11321132 replaceButton.setEnabled(false);
11331133
1134
- copyOptionsPanel.add(updown);
1134
+ versionManagerPanel.add(updown);
11351135
1136
- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136
+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11371137 nextVersionButton.setToolTipText("Next version");
11381138 nextVersionButton.addActionListener(this);
11391139 nextVersionButton.setEnabled(false);
11401140
1141
- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1141
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11421142 oneStepButton.setToolTipText("Animate one step forward");
11431143 oneStepButton.addActionListener(this);
11441144
....@@ -1161,11 +1161,11 @@
11611161
11621162 if (Globals.ADVANCED)
11631163 {
1164
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1164
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11651165 snapobjectButton.addActionListener(this);
11661166 snapobjectButton.setToolTipText("Snap Object");
11671167
1168
- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1168
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11691169 fourButton.addActionListener(this);
11701170 fourButton.setToolTipText("Show control panel only");
11711171 }
....@@ -1173,11 +1173,11 @@
11731173 //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
11741174
11751175
1176
- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1176
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11771177 rootButton.setToolTipText("Open selection in new tab");
11781178 rootButton.addActionListener(this);
11791179
1180
- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1180
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11811181 closeButton.setToolTipText("Close tab");
11821182 closeButton.addActionListener(this);
11831183 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
....@@ -1186,38 +1186,38 @@
11861186 cGridBag row1 = new cGridBag();
11871187
11881188 // INSERT
1189
- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1189
+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11901190 gridButton.setToolTipText("Create ground");
11911191 gridButton.addActionListener(this);
11921192
1193
- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193
+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11941194 boxButton.setToolTipText("Create box");
11951195 boxButton.addActionListener(this);
11961196
1197
- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1197
+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11981198 superButton.setToolTipText("Create superellipsoid");
11991199 superButton.addActionListener(this);
12001200
1201
- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1201
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12021202 sphereButton.setToolTipText("Create sphere");
12031203 sphereButton.addActionListener(this);
12041204
1205
- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1205
+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12061206 coneButton.setToolTipText("Create cone");
12071207 coneButton.addActionListener(this);
12081208
1209
- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1209
+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12101210 torusButton.setToolTipText("Create torus");
12111211 torusButton.addActionListener(this);
12121212
12131213 if (Globals.ADVANCED)
12141214 {
1215
- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1215
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12161216 kleinButton.setToolTipText("Create Klein bottle");
12171217 kleinButton.addActionListener(this);
12181218 }
12191219
1220
- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12211221 particlesButton.setToolTipText("Create particle system");
12221222 particlesButton.addActionListener(this);
12231223
....@@ -1225,31 +1225,31 @@
12251225
12261226 cGridBag row2 = new cGridBag();
12271227
1228
- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1228
+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12291229 groupButton.setToolTipText("Create group");
12301230 groupButton.addActionListener(this);
12311231
1232
- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1232
+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12331233 compositeButton.setToolTipText("Create composite");
12341234 compositeButton.addActionListener(this);
12351235
1236
- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1236
+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12371237 switchButton.setToolTipText("Create item switcher");
12381238 switchButton.addActionListener(this);
12391239
1240
- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1240
+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12411241 loopButton.setToolTipText("Create loop");
12421242 loopButton.addActionListener(this);
12431243
1244
- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1244
+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12451245 textureButton.setToolTipText("Create texture");
12461246 textureButton.addActionListener(this);
12471247
1248
- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1248
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12491249 overlayButton.setToolTipText("Create overlay");
12501250 overlayButton.addActionListener(this);
12511251
1252
- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1252
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12531253 lightButton.setToolTipText("Create light");
12541254 lightButton.addActionListener(this);
12551255
....@@ -1268,11 +1268,11 @@
12681268 CreateSkyboxPanel(oe.skyboxPanel);
12691269
12701270 // EDIT panel
1271
- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1271
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12721272 editButton.setToolTipText("Pin selection controls");
12731273 editButton.addActionListener(this);
12741274
1275
- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1275
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12761276 uneditButton.setToolTipText("Unpin and remove selection controls");
12771277 uneditButton.addActionListener(this);
12781278
....@@ -1280,7 +1280,7 @@
12801280 allParamsButton.setToolTipText("Show all controls");
12811281 allParamsButton.addActionListener(this);
12821282
1283
- editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1283
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12841284 clearPanelButton.setToolTipText("Clear all controls");
12851285 clearPanelButton.addActionListener(this);
12861286
....@@ -1288,7 +1288,7 @@
12881288 //unselectButton.setToolTipText("Unselect");
12891289 //unselectButton.addActionListener(this);
12901290
1291
- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1291
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12921292 flashSelectionButton.setToolTipText("Highlight selection");
12931293 flashSelectionButton.addActionListener(this);
12941294
....@@ -1311,6 +1311,8 @@
13111311
13121312 cGridBag jSPPanel = new cGridBag();
13131313
1314
+ jSPPanel.preferredHeight = 20;
1315
+
13141316 JScrollPane jSP;
13151317 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
13161318 jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
....@@ -1319,11 +1321,11 @@
13191321 oe.treePanel.add(jSPPanel);
13201322 oe.treePanel.Return();
13211323
1322
- oe.treePanel.add(copyOptionsPanel);
1324
+ oe.treePanel.add(versionManagerPanel);
13231325 oe.treePanel.Return();
1324
- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1325
- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1326
- sliderPane.preferredHeight = 1;
1326
+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1327
+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1328
+ versionSliderPane.preferredHeight = 3;
13271329
13281330 // mainPanel.setDividerLocation(0.1); //1.0);
13291331 mainPanel.setResizeWeight(0.4);
....@@ -3968,6 +3970,8 @@
39683970 if (source == closeButton)
39693971 {
39703972 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3973
+ Replace();
3974
+
39713975 cRadio ab;
39723976 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
39733977 {
....@@ -4066,6 +4070,8 @@
40664070 } else
40674071 if(source instanceof cRadio)
40684072 {
4073
+ Replace();
4074
+
40694075 group.parent = keepparent;
40704076 group.attributes = 0;
40714077 //group.editWindow = null;
....@@ -4121,13 +4127,21 @@
41214127
41224128 if (copy.versionlist == null)
41234129 {
4124
- copy.versionlist = new Object3D[100];
41254130 copy.versionindex = -1;
41264131
41274132 // Cannot work with loops
4128
- // To fix this issue, first mark all nodes above the root,
4133
+ // To fix this issue, we first mark all nodes above the root,
41294134 // and check if any of these nodes are reachable below the root.
4130
- //Save(true);
4135
+ Grafreed.grafreed.universe.TagObjects(copy, true);
4136
+
4137
+ if (!copy.HasTags())
4138
+ {
4139
+ copy.versionlist = new Object3D[100];
4140
+
4141
+ Save(true);
4142
+ }
4143
+
4144
+ Grafreed.grafreed.universe.TagObjects(copy, false);
41314145 }
41324146
41334147 SetVersionStates();
....@@ -4275,7 +4289,7 @@
42754289 TouchTransform(obj);
42764290 continue;
42774291 }
4278
- if ((mask&2) != 0) // Scale
4292
+ if ((mask&2) != 0) // Scale/rotation
42794293 {
42804294 obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
42814295 obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -4283,10 +4297,6 @@
42834297 obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
42844298 obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
42854299 obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4286
- }
4287
- if ((mask&4) != 0) // Rotation
4288
- {
4289
- // ?
42904300 }
42914301 if ((mask&1) != 0) // Translation
42924302 {
....@@ -5385,6 +5395,7 @@
53855395
53865396 void refreshContents(boolean cp)
53875397 {
5398
+ if (Globals.ADVANCED)
53885399 //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
53895400 if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
53905401 {