Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:58:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:highfidelity/hifi into MS14878_preventPasswordLeak

Browse source
This commit is contained in:
Zach Fox 2018-05-08 09:40:53 -07:00
commit c5ebc436ce
3 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -3634,7 +3634,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
} else { } else {
showCursor(Cursor::Icon::DEFAULT); showCursor(Cursor::Icon::DEFAULT);
} }
} else { } else if (!event->isAutoRepeat()){
resetSensors(true); resetSensors(true);
} }
break; break;

11
libraries/gpu/src/gpu/Texture_ktx.cpp
View file

@ -49,10 +49,11 @@ struct GPUKTXPayload {
// We can't copy the bitset in Texture::Usage in a crossplateform manner // We can't copy the bitset in Texture::Usage in a crossplateform manner
// So serialize it manually // So serialize it manually
*(uint32*)data = _usage._flags.to_ulong(); uint32 usageData = _usage._flags.to_ulong();
memcpy(data, &usageData, sizeof(uint32));
data += sizeof(uint32); data += sizeof(uint32);
*(TextureUsageType*)data = _usageType; memcpy(data, &_usageType, sizeof(TextureUsageType));
data += sizeof(TextureUsageType); data += sizeof(TextureUsageType);
return data + PADDING; return data + PADDING;
@ -80,10 +81,12 @@ struct GPUKTXPayload {
// We can't copy the bitset in Texture::Usage in a crossplateform manner // We can't copy the bitset in Texture::Usage in a crossplateform manner
// So unserialize it manually // So unserialize it manually
_usage = Texture::Usage(*(const uint32*)data); uint32 usageData;
memcpy(&usageData, data, sizeof(uint32));
_usage = Texture::Usage(usageData);
data += sizeof(uint32); data += sizeof(uint32);
_usageType = *(const TextureUsageType*)data; memcpy(&_usageType, data, sizeof(TextureUsageType));
return true; return true;
} }

11
scripts/system/edit.js
View file

@ -1165,17 +1165,11 @@ function setupModelMenus() {
}); });
modelMenuAddedDelete = true; modelMenuAddedDelete = true;
} }
Menu.addMenuItem({
menuName: "Edit",
menuItemName: "Entity List...",
afterItem: "Entities",
grouping: "Advanced"
});
Menu.addMenuItem({ Menu.addMenuItem({
menuName: "Edit", menuName: "Edit",
menuItemName: "Parent Entity to Last", menuItemName: "Parent Entity to Last",
afterItem: "Entity List...", afterItem: "Entities",
grouping: "Advanced" grouping: "Advanced"
}); });
@ -1297,7 +1291,6 @@ function cleanupModelMenus() {
Menu.removeMenuItem("Edit", "Parent Entity to Last"); Menu.removeMenuItem("Edit", "Parent Entity to Last");
Menu.removeMenuItem("Edit", "Unparent Entity"); Menu.removeMenuItem("Edit", "Unparent Entity");
Menu.removeMenuItem("Edit", "Entity List...");
Menu.removeMenuItem("Edit", "Allow Selecting of Large Models"); Menu.removeMenuItem("Edit", "Allow Selecting of Large Models");
Menu.removeMenuItem("Edit", "Allow Selecting of Small Models"); Menu.removeMenuItem("Edit", "Allow Selecting of Small Models");
Menu.removeMenuItem("Edit", "Allow Selecting of Lights"); Menu.removeMenuItem("Edit", "Allow Selecting of Lights");
@ -1659,8 +1652,6 @@ function handeMenuEvent(menuItem) {
Window.promptTextChanged.connect(onPromptTextChanged); Window.promptTextChanged.connect(onPromptTextChanged);
Window.promptAsync("URL of SVO to import", ""); Window.promptAsync("URL of SVO to import", "");
} }
} else if (menuItem === "Entity List...") {
entityListTool.toggleVisible();
} else if (menuItem === "Select All Entities In Box") { } else if (menuItem === "Select All Entities In Box") {
selectAllEtitiesInCurrentSelectionBox(false); selectAllEtitiesInCurrentSelectionBox(false);
} else if (menuItem === "Select All Entities Touching Box") { } else if (menuItem === "Select All Entities Touching Box") {