From 5e1c410f8b99d246d1bbf828bbd8445bb716feeb Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 09 Sep 2019 21:59:44 -0400
Subject: [PATCH] Download tab + resized icons.
---
GroupEditor.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index 0d46be5..513ea9a 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -803,7 +803,7 @@
genNormalsCADItem.addActionListener(this);
genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
genNormalsMESHItem.addActionListener(this);
- if (Globals.ADVANCED)
+ //if (Globals.ADVANCED)
{
genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
genNormalsMINEItem.addActionListener(this);
@@ -966,7 +966,7 @@
currenttab.setName(tabname);
//added = false;
resourcecontainer.add(currenttab);
- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
rowcount = 1;
colcount = 0;
texturecount = 0;
@@ -981,6 +981,11 @@
currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
}
+ columns = 5;
+
+ if (path[0].contains("D&R") || path[0].contains("Paint"))
+ columns = 4;
+
AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
totalcount++;
@@ -1195,6 +1200,7 @@
//clearButton.addActionListener(this);
cGridBag row1 = new cGridBag();
+ row1.preferredHeight = 8;
// INSERT
row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
@@ -1235,6 +1241,7 @@
oe.toolboxPanel.add(row1);
cGridBag row2 = new cGridBag();
+ row2.preferredHeight = 8;
row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
groupButton.setToolTipText("Create group");
@@ -2120,7 +2127,7 @@
obj.parent.TransformToWorld(maxima); //, maxima);
}
- Object3D shadow = new Object3D("Shadow " + obj.name);
+ Object3D shadow = new Object3D("Shadow" + obj.name);
shadow.toParent = LA.newMatrix();
shadow.fromParent = LA.newMatrix();
@@ -5401,7 +5408,7 @@
if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
{
CameraPane.camerachangeframe = 0; // don't refuse it
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
}
// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
--
Gitblit v1.6.2