Model Definitions fixes

Author: computergeek1507

README.txt

@@ -283,6 +283,13 @@ XLIGHTS/NUTCRACKER RELEASE NOTES
     -bug (cybercop23)            Fix Face and State effect definition choices when switching between different
                                  model groups.
     -bug (derwin12)              Fixed locked effects duplicating when dragged across rows/layers (#6697)
+    -bug (scott)                 Fix a crash clicking in the Model Definitions preview (Faces/States)
+                                 with nothing selected in the name list
+    -enh (scott)                 Model Definitions: the preview's pencil tool and click-drag node
+                                 selection are disabled when nothing is selected, a SubModel is in
+                                 SubBuffer mode, or a Face is in Matrix mode; the pencil is also disabled
+                                 in Single Node mode, though click-drag there still works and picks the
+                                 first node touched
 
 2026.15  August 4, 2026
     -change (dkulp)              Faces: the automatic eye blink is now computed independently per frame, so

src-iPad/App/LayoutEditorView.swift

@@ -7516,7 +7516,8 @@ private struct SubModelDetailEditor: View {
                 highlightedNodes: highlightedNodes,
                 onToggleNode: toggleNode,
                 onAddNodes: addNodes,
-                controller: previewController)
+                controller: previewController,
+                nodesEditable: entry.isRanges)
                 .background(Color.black)
                 .clipShape(RoundedRectangle(cornerRadius: 8))
             Text(entry.isRanges

src-iPad/App/SubmodelPreviewPane.swift

@@ -49,6 +49,10 @@ struct SubmodelPreviewPane: UIViewRepresentable {
     let onToggleNode: (Int) -> Void
     let onAddNodes: ([Int]) -> Void
     var controller: SubmodelPreviewController? = nil
+    // Tap-to-toggle and marquee only make sense for a Ranges/Lines submodel;
+    // a Sub-buffer submodel isn't defined by a node list, so there's nothing
+    // for either gesture to edit (mirrors desktop's SubModelsPanel::CanEditPreviewNodes).
+    var nodesEditable: Bool = true
 
     func makeCoordinator() -> Coordinator {
         Coordinator(parent: parentModelName)
@@ -78,6 +82,7 @@ struct SubmodelPreviewPane: UIViewRepresentable {
         context.coordinator.document = document
         context.coordinator.onToggleNode = onToggleNode
         context.coordinator.onAddNodes = onAddNodes
+        context.coordinator.nodesEditable = nodesEditable
         controller?.coordinator = context.coordinator
 
         let pinch = UIPinchGestureRecognizer(
@@ -135,6 +140,7 @@ struct SubmodelPreviewPane: UIViewRepresentable {
         context.coordinator.document = document
         context.coordinator.onToggleNode = onToggleNode
         context.coordinator.onAddNodes = onAddNodes
+        context.coordinator.nodesEditable = nodesEditable
         controller?.coordinator = context.coordinator
         if context.coordinator.lastHighlight != highlightedNodes {
             context.coordinator.applyHighlights(highlightedNodes)
@@ -158,6 +164,7 @@ struct SubmodelPreviewPane: UIViewRepresentable {
         var document: XLSequenceDocument?
         var onToggleNode: ((Int) -> Void)?
         var onAddNodes: (([Int]) -> Void)?
+        var nodesEditable: Bool = true
         var lastHighlight: [Int] = []
         private let parent: String
         private var pinchStartZoom: Float = 1.0
@@ -250,6 +257,7 @@ struct SubmodelPreviewPane: UIViewRepresentable {
         }
 
         @objc func handleTap(_ g: UITapGestureRecognizer) {
+            guard nodesEditable else { return }
             guard let bridge, let view = g.view, let document else { return }
             let pt = g.location(in: view)
             let n = bridge.nodeNearPoint(pt,
@@ -267,6 +275,7 @@ struct SubmodelPreviewPane: UIViewRepresentable {
         }
 
         @objc func handleMarquee(_ g: UILongPressGestureRecognizer) {
+            guard nodesEditable else { return }
             guard let view = g.view else { return }
             switch g.state {
             case .began:

src-ui-wx/layout/ModelPreview.cpp

@@ -86,7 +86,7 @@ void ModelPreview::ResetPencilSize() {
 }
 
 bool ModelPreview::IsPencilActive() const {
-    return _supportsPencil && s_pencilSizeIndex > 0;
+    return _supportsPencil && _pencilEnabled && s_pencilSizeIndex > 0;
 }
 
 void ModelPreview::StartPaintPath(std::vector<xlPoint>& path, int x, int y, bool freeform) {
@@ -146,7 +146,7 @@ std::vector<float> ModelPreview::GetPencilStrokeOffsets() const {
 }
 
 bool ModelPreview::HitTestPencilIcon(int x, int y) const {
-    if (!_supportsPencil) return false;
+    if (!_supportsPencil || !_pencilEnabled) return false;
     int w = mWindowWidth;
     if (w < 60) return false;
     return (x >= w - 44 && x <= w - 4 && y >= 4 && y <= 44);
@@ -185,7 +185,7 @@ void ModelPreview::AddPencilIconToAccumulator() {
     if (!_supportsPencil || solidProgram == nullptr) return;
     auto acc = solidProgram->getAccumulator();
     int start = acc->getCount();
-    const xlColor pencilColor = IsPencilActive() ? xlColor(255, 140, 0) : xlColor(170, 170, 170);
+    const xlColor pencilColor = !_pencilEnabled ? xlColor(90, 90, 90) : (IsPencilActive() ? xlColor(255, 140, 0) : xlColor(170, 170, 170));
 
     int w = mWindowWidth;
     int h = mWindowHeight;

src-ui-wx/layout/ModelPreview.h

@@ -194,6 +194,10 @@ class ModelPreview : public GRAPHICS_BASE_CLASS, public IModelPreview
     static void ResetPencilSize();
     // Only previews used for freeform node painting (faces/states/submodels) show the pencil
     void SetSupportsPencil(bool b) { _supportsPencil = b; }
+    // Whether the pencil can be used right now (e.g. a submodel is selected and
+    // it isn't in SubBuffer mode) -- distinct from _supportsPencil, which just
+    // says this preview hosts the feature at all.
+    void SetPencilEnabled(bool b) { _pencilEnabled = b; }
     bool IsPencilActive() const;
     float GetPencilCatchRadiusMultiplier() const override;
     std::vector<float> GetPencilStrokeOffsets() const;
@@ -255,6 +259,7 @@ class ModelPreview : public GRAPHICS_BASE_CLASS, public IModelPreview
     bool _center2D0 = false;
     bool scaleImage = false;
     bool _supportsPencil = false;
+    bool _pencilEnabled = true;
     bool allowSelected;
     bool allowPreviewChange;
     ControllerObjectContext _controllerObjectContext = ControllerObjectContext::None;

src-ui-wx/model/ModelFacesPanel.cpp

@@ -731,6 +731,19 @@ void ModelFacesPanel::SelectFaceModel(const std::string& name)
 void ModelFacesPanel::OnMatrixNameChoiceSelect(wxCommandEvent& event)
 {
     SelectFaceModel(NameChoice->GetString(NameChoice->GetSelection()).ToStdString());
+    if (_modelPreview) {
+        _modelPreview->SetPencilEnabled(CanUsePencil());
+    }
+}
+
+bool ModelFacesPanel::CanEditPreviewNodes() const
+{
+    return NameChoice->GetSelection() != wxNOT_FOUND && FaceTypeChoice->GetSelection() != MATRIX_FACE;
+}
+
+bool ModelFacesPanel::CanUsePencil() const
+{
+    return CanEditPreviewNodes() && FaceTypeChoice->GetSelection() != SINGLE_NODE_FACE;
 }
 
 void ModelFacesPanel::OnButtonMatrixAddClicked(wxCommandEvent& event)
@@ -1294,6 +1307,9 @@ void ModelFacesPanel::OnFaceTypeChoicePageChanged(wxChoicebookEvent& event)
     }
     SelectFaceModel(name);
     UpdatePreview("", *wxWHITE);
+    if (_modelPreview) {
+        _modelPreview->SetPencilEnabled(CanUsePencil());
+    }
 }
 
 void ModelFacesPanel::OnNodeRangeGridCellLeftDClick(wxGridEvent& event)
@@ -1897,6 +1913,7 @@ void ModelFacesPanel::OnPreviewMouseLeave(wxMouseEvent& event)
 void ModelFacesPanel::OnPreviewLeftDown(wxMouseEvent& event)
 {
     if (!_isActive) return;
+    if (!CanEditPreviewNodes()) return;
     if (_modelPreview && _modelPreview->HitTestPencilIcon(event.GetX(), event.GetY())) {
         _modelPreview->ShowPencilSizeMenu();
         return;
@@ -1916,6 +1933,7 @@ void ModelFacesPanel::OnPreviewLeftDown(wxMouseEvent& event)
 void ModelFacesPanel::OnPreviewLeftDClick(wxMouseEvent& event)
 {
     if (!_isActive) return;
+    if (!CanEditPreviewNodes()) return;
     if (!_modelPreview) return;
     glm::vec3 ray_origin;
     glm::vec3 ray_direction;
@@ -2036,6 +2054,22 @@ void ModelFacesPanel::SelectAllInBoundingRect(bool shiftDwn, bool freeform)
         return;
     }
 
+    if (faceData[name]["Type"] == "SingleNode") {
+        int row = SingleNodeGrid->GetGridCursorRow();
+        if (row < 0)
+            return;
+        std::vector<int> nodes = GetDragSelectedNodes(freeform);
+        if (nodes.empty())
+            return;
+        // Single Node rows hold exactly one node -- take the first node the
+        // drag/pencil touched rather than building a range out of all of them.
+        std::string node = model->GetNodeName(nodes[0] - 1, true);
+        SingleNodeGrid->SetCellValue(row, CHANNEL_COL, node);
+        SingleNodeGrid->Refresh();
+        GetValue(SingleNodeGrid, row, CHANNEL_COL, faceData[name]);
+        return;
+    }
+
     if (faceData[name]["Type"] != "NodeRange") {
         return;
     }

src-ui-wx/model/ModelFacesPanel.h

@@ -178,6 +178,14 @@ class ModelFacesPanel : public wxPanel {
     void StartOutputToLights();
     bool StopOutputToLights();
     void SelectFaceModel(const std::string& s);
+    // Pencil/click-drag node editing on the preview requires a face to be selected --
+    // NameChoice->GetSelection() is wxNOT_FOUND otherwise, and SelectAllInBoundingRect's
+    // NameChoice->GetString(GetSelection()) call would hit a wx assertion.
+    bool CanEditPreviewNodes() const;
+    // Pencil-specific: Single Node rows hold one node each, so freeform
+    // painting (which collects a whole swath) doesn't apply -- plain
+    // click-drag still works there and just takes the first node hit.
+    bool CanUsePencil() const;
     void UpdatePreview(const std::string& channels, wxColor c);
     std::vector<int> GetSelectedGridRows(wxGrid* grid, int fallbackRow);
     void UpdatePreviewRows(wxGrid* grid, int fallbackRow);

src-ui-wx/model/ModelStatesPanel.cpp

@@ -925,6 +925,7 @@ void ModelStatesPanel::UpdateStateType()
     }
     SelectStateModel(name);
     if (model) ClearNodeColor(model);
+    ValidateWindow();
 }
 
 void ModelStatesPanel::OnNodeRangeGridCellLeftDClick(wxGridEvent& event)
@@ -1226,6 +1227,20 @@ void ModelStatesPanel::ValidateWindow()
             }
         }
     }
+
+    if (_modelPreview) {
+        _modelPreview->SetPencilEnabled(CanUsePencil());
+    }
+}
+
+bool ModelStatesPanel::CanEditPreviewNodes() const
+{
+    return NameChoice->GetSelection() != wxNOT_FOUND;
+}
+
+bool ModelStatesPanel::CanUsePencil() const
+{
+    return CanEditPreviewNodes() && StateTypeChoice->GetSelection() != SINGLE_NODE_STATE;
 }
 
 bool ModelStatesPanel::HasInvalidRows() const
@@ -1700,6 +1715,7 @@ void ModelStatesPanel::OnPreviewMouseLeave(wxMouseEvent& event)
 void ModelStatesPanel::OnPreviewLeftDown(wxMouseEvent& event)
 {
     if (!_isActive) return;
+    if (!CanEditPreviewNodes()) return;
     if (_modelPreview && _modelPreview->HitTestPencilIcon(event.GetX(), event.GetY())) {
         _modelPreview->ShowPencilSizeMenu();
         return;
@@ -1721,6 +1737,7 @@ void ModelStatesPanel::OnPreviewLeftDown(wxMouseEvent& event)
 void ModelStatesPanel::OnPreviewLeftDClick(wxMouseEvent& event)
 {
     if (!_isActive) return;
+    if (!CanEditPreviewNodes()) return;
     if (!_modelPreview) return;
     glm::vec3 ray_origin;
     glm::vec3 ray_direction;
@@ -1846,6 +1863,22 @@ void ModelStatesPanel::SelectAllInBoundingRect(bool shiftDwn, bool freeform)
         return;
     }
 
+    if (stateData[name]["Type"] == "SingleNode") {
+        int row = SingleNodeGrid->GetGridCursorRow();
+        if (row < 0)
+            return;
+        std::vector<int> nodes = GetDragSelectedNodes(freeform);
+        if (nodes.empty())
+            return;
+        // Single Node rows hold exactly one node -- take the first node the
+        // drag/pencil touched rather than building a range out of all of them.
+        std::string node = model->GetNodeName(nodes[0] - 1, true);
+        SingleNodeGrid->SetCellValue(row, CHANNEL_COL, node);
+        SingleNodeGrid->Refresh();
+        GetValue(SingleNodeGrid, row, CHANNEL_COL, stateData[name]);
+        return;
+    }
+
     if (stateData[name]["Type"] != "NodeRange") {
         return;
     }

src-ui-wx/model/ModelStatesPanel.h

@@ -172,6 +172,14 @@ class ModelStatesPanel : public wxPanel {
     void GetValue(wxGrid* grid, const int row, const int col, std::map<std::string, std::string>& info);
     void AddLabel(wxString label);
     void ValidateWindow();
+    // Pencil/click-drag node editing on the preview requires a state to be selected --
+    // NameChoice->GetSelection() is wxNOT_FOUND otherwise, and SelectAllInBoundingRect's
+    // NameChoice->GetString(GetSelection()) call would hit a wx assertion.
+    bool CanEditPreviewNodes() const;
+    // Pencil-specific: Single Node rows hold one node each, so freeform
+    // painting (which collects a whole swath) doesn't apply -- plain
+    // click-drag still works there and just takes the first node hit.
+    bool CanUsePencil() const;
     void PopulateStateFilter();
     void UpdateStateFilter();
     void BuildStateAnimSteps();

src-ui-wx/model/SubModelsPanel.cpp

@@ -1926,6 +1926,15 @@ void SubModelsPanel::ValidateWindow()
         _animPlaying ||
         (ListCtrl_SubModels->GetSelectedItemCount() == 1 && TypeNotebook->GetSelection() == 0)
     );
+
+    if (_modelPreview) {
+        _modelPreview->SetPencilEnabled(CanEditPreviewNodes());
+    }
+}
+
+bool SubModelsPanel::CanEditPreviewNodes() const
+{
+    return ListCtrl_SubModels->GetSelectedItemCount() == 1 && TypeNotebook->GetSelection() == 0;
 }
 
 void SubModelsPanel::UnSelectAll()
@@ -2682,6 +2691,7 @@ void SubModelsPanel::OnPreviewMouseLeave(wxMouseEvent& event)
 void SubModelsPanel::OnPreviewLeftDown(wxMouseEvent& event)
 {
     if (!_isActive) return;
+    if (!CanEditPreviewNodes()) return;
     if (_modelPreview && _modelPreview->HitTestPencilIcon(event.GetX(), event.GetY())) {
         _modelPreview->ShowPencilSizeMenu();
         return;
@@ -2705,6 +2715,7 @@ void SubModelsPanel::OnPreviewLeftDown(wxMouseEvent& event)
 void SubModelsPanel::OnPreviewLeftDClick(wxMouseEvent& event)
 {
     if (!_isActive) return;
+    if (!CanEditPreviewNodes()) return;
     glm::vec3 ray_origin;
     glm::vec3 ray_direction;
     GetMouseLocation(event.GetX(), event.GetY(), ray_origin, ray_direction);