diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-12 02:42:58 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-12 02:42:58 (GMT) |
| commit | a5ae843553bd83feda78bb107314ff3eb9b23c95 (patch) | |
| tree | 20f92e4d8e85813aeab4823149d0a5887da03151 | |
| parent | 135bf443478dac8f4141dcbbb8fb1aced7731be1 (diff) | |
| download | powder-a5ae843553bd83feda78bb107314ff3eb9b23c95.zip powder-a5ae843553bd83feda78bb107314ff3eb9b23c95.tar.gz | |
also check .Enabled in PROP
| -rw-r--r-- | src/gui/game/PropertyTool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/game/PropertyTool.cpp b/src/gui/game/PropertyTool.cpp index 6c9bf26..90e70b3 100644 --- a/src/gui/game/PropertyTool.cpp +++ b/src/gui/game/PropertyTool.cpp @@ -139,7 +139,7 @@ void PropertyWindow::SetProperty() buffer.exceptions(std::stringstream::failbit | std::stringstream::badbit); buffer >> tempInt; } - if (property->GetOption().first == "type" && (tempInt < 0 || tempInt >= PT_NUM)) + if (property->GetOption().first == "type" && (tempInt < 0 || tempInt >= PT_NUM || !sim->elements[tempInt].Enabled)) { new ErrorMessage("Could not set property", "Invalid Particle Type"); return; |