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);
....@@ -415,12 +415,14 @@
415415 this.copy = this.group = group;
416416 //selectees = this.group.selectees;
417417
418
+ assert(false);
419
+
418420 if (copy.versionlist == null)
419421 {
420422 copy.versionlist = new Object3D[100];
421423 copy.versionindex = -1;
422424
423
- Save(true);
425
+ //Save(true);
424426 }
425427
426428 if(ui)
....@@ -449,7 +451,7 @@
449451 copy.versionlist = new Object3D[100];
450452 copy.versionindex = -1;
451453
452
- Save(true);
454
+ //Save(true);
453455 }
454456 }
455457
....@@ -855,9 +857,9 @@
855857 hideleavesItem.addActionListener(this);
856858 showleavesItem = menu.add(new MenuItem("Show Leaves"));
857859 showleavesItem.addActionListener(this);
858
- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
860
+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
859861 markleavesItem.addActionListener(this);
860
- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
862
+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
861863 unmarkleavesItem.addActionListener(this);
862864 rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
863865 rewindleavesItem.addActionListener(this);
....@@ -1036,9 +1038,9 @@
10361038 oe.radioPanel.add(dummyButton);
10371039 oe.buttonGroup.add(dummyButton);
10381040 */
1039
- cGridBag copyOptionsPanel = new cGridBag();
1041
+ cGridBag versionManagerPanel = new cGridBag();
10401042
1041
- copyOptionsPanel.preferredHeight = 2;
1043
+ versionManagerPanel.preferredHeight = 4;
10421044
10431045 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
10441046
....@@ -1065,25 +1067,25 @@
10651067 // }
10661068 // });
10671069
1068
- 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);
10691071 collapseButton.setToolTipText("Collapse toolbar");
10701072 collapseButton.addActionListener(this);
10711073
1072
- 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);
10731075 maximize3DButton.setToolTipText("Maximize 3D view");
10741076 maximize3DButton.addActionListener(this);
10751077
1076
- 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);
10771079 twoButton.setToolTipText("Show 3D view only");
10781080 twoButton.addActionListener(this);
10791081 this.fullscreenLayout = twoButton;
10801082
1081
- 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);
10821084 threeButton.setToolTipText("Show controls and 3D view");
10831085 threeButton.addActionListener(this);
10841086 if (Globals.ADVANCED)
10851087 {
1086
- 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);
10871089 sixButton.setToolTipText("Show 3D view and controls");
10881090 sixButton.addActionListener(this);
10891091 }
....@@ -1092,50 +1094,51 @@
10921094 // sevenButton.addActionListener(this);
10931095 //
10941096
1095
- 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);
10961098 fullButton.setToolTipText("Full-screen window");
10971099 fullButton.addActionListener(this);
10981100
1099
- 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);
11001102 screenfitButton.setToolTipText("Screen fit");
11011103 screenfitButton.addActionListener(this);
11021104
1103
- 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);
11041106 restoreCameraButton.setToolTipText("Restore viewpoint");
11051107 restoreCameraButton.addActionListener(this);
11061108
1107
- 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);
11081110 saveVersionButton.setToolTipText("Duplicate current version");
11091111 saveVersionButton.addActionListener(this);
11101112
1111
- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113
+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11121114 deleteVersionButton.setToolTipText("Delete current version");
11131115 deleteVersionButton.addActionListener(this);
1116
+ deleteVersionButton.setEnabled(false);
11141117
1115
- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11161119 previousVersionButton.setToolTipText("Previous version");
11171120 previousVersionButton.addActionListener(this);
11181121 previousVersionButton.setEnabled(false);
11191122
11201123 cGridBag updown = new cGridBag().setVertical(true);
1121
- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124
+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11221125 restoreButton.setToolTipText("Undo (restore current version)");
11231126 restoreButton.addActionListener(this);
1124
- //restoreButton.setEnabled(false);
1127
+ restoreButton.setEnabled(false);
11251128
1126
- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11271130 replaceButton.setToolTipText("Save (replace current version)");
11281131 replaceButton.addActionListener(this);
1129
- //replaceButton.setEnabled(false);
1132
+ replaceButton.setEnabled(false);
11301133
1131
- copyOptionsPanel.add(updown);
1134
+ versionManagerPanel.add(updown);
11321135
1133
- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136
+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11341137 nextVersionButton.setToolTipText("Next version");
11351138 nextVersionButton.addActionListener(this);
11361139 nextVersionButton.setEnabled(false);
11371140
1138
- 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);
11391142 oneStepButton.setToolTipText("Animate one step forward");
11401143 oneStepButton.addActionListener(this);
11411144
....@@ -1158,11 +1161,11 @@
11581161
11591162 if (Globals.ADVANCED)
11601163 {
1161
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1164
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11621165 snapobjectButton.addActionListener(this);
11631166 snapobjectButton.setToolTipText("Snap Object");
11641167
1165
- 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);
11661169 fourButton.addActionListener(this);
11671170 fourButton.setToolTipText("Show control panel only");
11681171 }
....@@ -1170,11 +1173,11 @@
11701173 //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
11711174
11721175
1173
- 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);
11741177 rootButton.setToolTipText("Open selection in new tab");
11751178 rootButton.addActionListener(this);
11761179
1177
- 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);
11781181 closeButton.setToolTipText("Close tab");
11791182 closeButton.addActionListener(this);
11801183 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
....@@ -1183,38 +1186,38 @@
11831186 cGridBag row1 = new cGridBag();
11841187
11851188 // INSERT
1186
- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1189
+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11871190 gridButton.setToolTipText("Create ground");
11881191 gridButton.addActionListener(this);
11891192
1190
- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193
+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11911194 boxButton.setToolTipText("Create box");
11921195 boxButton.addActionListener(this);
11931196
1194
- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1197
+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11951198 superButton.setToolTipText("Create superellipsoid");
11961199 superButton.addActionListener(this);
11971200
1198
- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1201
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11991202 sphereButton.setToolTipText("Create sphere");
12001203 sphereButton.addActionListener(this);
12011204
1202
- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1205
+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12031206 coneButton.setToolTipText("Create cone");
12041207 coneButton.addActionListener(this);
12051208
1206
- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1209
+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12071210 torusButton.setToolTipText("Create torus");
12081211 torusButton.addActionListener(this);
12091212
12101213 if (Globals.ADVANCED)
12111214 {
1212
- 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);
12131216 kleinButton.setToolTipText("Create Klein bottle");
12141217 kleinButton.addActionListener(this);
12151218 }
12161219
1217
- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12181221 particlesButton.setToolTipText("Create particle system");
12191222 particlesButton.addActionListener(this);
12201223
....@@ -1222,31 +1225,31 @@
12221225
12231226 cGridBag row2 = new cGridBag();
12241227
1225
- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1228
+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12261229 groupButton.setToolTipText("Create group");
12271230 groupButton.addActionListener(this);
12281231
1229
- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1232
+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12301233 compositeButton.setToolTipText("Create composite");
12311234 compositeButton.addActionListener(this);
12321235
1233
- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1236
+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12341237 switchButton.setToolTipText("Create item switcher");
12351238 switchButton.addActionListener(this);
12361239
1237
- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1240
+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12381241 loopButton.setToolTipText("Create loop");
12391242 loopButton.addActionListener(this);
12401243
1241
- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1244
+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12421245 textureButton.setToolTipText("Create texture");
12431246 textureButton.addActionListener(this);
12441247
1245
- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1248
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12461249 overlayButton.setToolTipText("Create overlay");
12471250 overlayButton.addActionListener(this);
12481251
1249
- 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);
12501253 lightButton.setToolTipText("Create light");
12511254 lightButton.addActionListener(this);
12521255
....@@ -1256,6 +1259,8 @@
12561259
12571260 CreateTexturePanel(textures);
12581261
1262
+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
1263
+
12591264 oe.toolboxPanel.add(textures);
12601265
12611266 textures.preferredHeight = 100;
....@@ -1263,11 +1268,11 @@
12631268 CreateSkyboxPanel(oe.skyboxPanel);
12641269
12651270 // EDIT panel
1266
- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1271
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12671272 editButton.setToolTipText("Pin selection controls");
12681273 editButton.addActionListener(this);
12691274
1270
- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1275
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12711276 uneditButton.setToolTipText("Unpin and remove selection controls");
12721277 uneditButton.addActionListener(this);
12731278
....@@ -1275,7 +1280,7 @@
12751280 allParamsButton.setToolTipText("Show all controls");
12761281 allParamsButton.addActionListener(this);
12771282
1278
- editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1283
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12791284 clearPanelButton.setToolTipText("Clear all controls");
12801285 clearPanelButton.addActionListener(this);
12811286
....@@ -1283,7 +1288,7 @@
12831288 //unselectButton.setToolTipText("Unselect");
12841289 //unselectButton.addActionListener(this);
12851290
1286
- 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);
12871292 flashSelectionButton.setToolTipText("Highlight selection");
12881293 flashSelectionButton.addActionListener(this);
12891294
....@@ -1306,6 +1311,8 @@
13061311
13071312 cGridBag jSPPanel = new cGridBag();
13081313
1314
+ jSPPanel.preferredHeight = 20;
1315
+
13091316 JScrollPane jSP;
13101317 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
13111318 jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
....@@ -1314,11 +1321,11 @@
13141321 oe.treePanel.add(jSPPanel);
13151322 oe.treePanel.Return();
13161323
1317
- oe.treePanel.add(copyOptionsPanel);
1324
+ oe.treePanel.add(versionManagerPanel);
13181325 oe.treePanel.Return();
1319
- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1320
- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1321
- sliderPane.preferredHeight = 1;
1326
+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1327
+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1328
+ versionSliderPane.preferredHeight = 3;
13221329
13231330 // mainPanel.setDividerLocation(0.1); //1.0);
13241331 mainPanel.setResizeWeight(0.4);
....@@ -3963,6 +3970,8 @@
39633970 if (source == closeButton)
39643971 {
39653972 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3973
+ Replace();
3974
+
39663975 cRadio ab;
39673976 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
39683977 {
....@@ -4061,6 +4070,8 @@
40614070 } else
40624071 if(source instanceof cRadio)
40634072 {
4073
+ Replace();
4074
+
40644075 group.parent = keepparent;
40654076 group.attributes = 0;
40664077 //group.editWindow = null;
....@@ -4116,13 +4127,21 @@
41164127
41174128 if (copy.versionlist == null)
41184129 {
4119
- copy.versionlist = new Object3D[100];
41204130 copy.versionindex = -1;
41214131
41224132 // Cannot work with loops
4123
- // To fix this issue, first mark all nodes above the root,
4133
+ // To fix this issue, we first mark all nodes above the root,
41244134 // and check if any of these nodes are reachable below the root.
4125
- //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);
41264145 }
41274146
41284147 SetVersionStates();
....@@ -4270,7 +4289,7 @@
42704289 TouchTransform(obj);
42714290 continue;
42724291 }
4273
- if ((mask&2) != 0) // Scale
4292
+ if ((mask&2) != 0) // Scale/rotation
42744293 {
42754294 obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
42764295 obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -4278,10 +4297,6 @@
42784297 obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
42794298 obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
42804299 obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4281
- }
4282
- if ((mask&4) != 0) // Rotation
4283
- {
4284
- // ?
42854300 }
42864301 if ((mask&1) != 0) // Translation
42874302 {
....@@ -5380,6 +5395,7 @@
53805395
53815396 void refreshContents(boolean cp)
53825397 {
5398
+ if (Globals.ADVANCED)
53835399 //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
53845400 if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
53855401 {