CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77 from Vulpovile/bugfix/fix-crash-on-void

Browse Source 
Fix crash when bricks fall into void
This commit is contained in:
Vulpovile
2022-10-03 20:52:14 -07:00
committed by GitHub
parent 1356ef52ab f5aaef5b16
commit e1716e7417
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Blocks3D.exe.manifest
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity <assemblyIdentity
version="0.0.106.0" version="0.0.106.1"
processorArchitecture="*" processorArchitecture="*"
name="Blocks3D.Blocks3D.Blocks3D" name="Blocks3D.Blocks3D.Blocks3D"
type="win32" type="win32"

8
Dialogs.rc
View File

@@ -18,8 +18,8 @@ IDB_BITMAP1 BITMAP "Parts.bmp"
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 0,0,106,0 FILEVERSION 0,0,106,1
PRODUCTVERSION 0,0,106,0 PRODUCTVERSION 0,0,106,1
FILEOS VOS__WINDOWS32 FILEOS VOS__WINDOWS32
FILETYPE VFT_APP FILETYPE VFT_APP
FILESUBTYPE VFT2_UNKNOWN FILESUBTYPE VFT2_UNKNOWN
@@ -33,14 +33,14 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
VALUE "Comments", "" VALUE "Comments", ""
VALUE "CompanyName", "Blocks3D Team" VALUE "CompanyName", "Blocks3D Team"
VALUE "FileDescription", "Blocks 3D" VALUE "FileDescription", "Blocks 3D"
VALUE "FileVersion", "v0.0.106.0" VALUE "FileVersion", "v0.0.106.1"
VALUE "InternalName", "Blocks3D" VALUE "InternalName", "Blocks3D"
VALUE "LegalCopyright", "Blocks3D Team - 2022" VALUE "LegalCopyright", "Blocks3D Team - 2022"
VALUE "LegalTrademarks", "" VALUE "LegalTrademarks", ""
VALUE "OriginalFilename", "Blocks3D.exe" VALUE "OriginalFilename", "Blocks3D.exe"
VALUE "PrivateBuild", "" VALUE "PrivateBuild", ""
VALUE "ProductName", "Blocks3D" VALUE "ProductName", "Blocks3D"
VALUE "ProductVersion", "v0.0.106.0" VALUE "ProductVersion", "v0.0.106.1"
VALUE "SpecialBuild", "" VALUE "SpecialBuild", ""
} }
} }

11
src/source/PropertyWindow.cpp
View File

@@ -338,7 +338,7 @@ void PropertyWindow::_resize()
void PropertyWindow::UpdateSelected(std::vector<Instance *> instances) void PropertyWindow::UpdateSelected(std::vector<Instance *> instances)
{ {
if(instances.size() < 0) if(instances.size() <= 0)
{ {
ClearProperties(); ClearProperties();
return; return;
@@ -367,5 +367,12 @@ void PropertyWindow::UpdateSelected(std::vector<Instance *> instances)
void PropertyWindow::ClearProperties() void PropertyWindow::ClearProperties()
{ {
PropGrid_ResetContent(_propGrid); if(g_dataModel != NULL)
{
g_dataModel->getSelectionService()->addSelected(g_dataModel);
}
else
{
PropGrid_ResetContent(_propGrid);
}
} }