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

Merge 10.0.0.234:src/hifi-master into set-model-entity-joints

Browse source
This commit is contained in:
Seth Alves 2016-01-04 14:58:59 -08:00
commit 1ad4e39a85
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -713,8 +713,8 @@ bool RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame(int index,
bool result = false;
_jointDataLock.withWriteLock([&] {
resizeJointArrays();
if (index >= 0 && index < _absoluteJointRotationsInObjectFrame.size() /* &&
_absoluteJointRotationsInObjectFrame[index] != rotation*/) {
if (index >= 0 && index < _absoluteJointRotationsInObjectFrame.size() &&
_absoluteJointRotationsInObjectFrame[index] != rotation) {
_absoluteJointRotationsInObjectFrame[index] = rotation;
_absoluteJointRotationsInObjectFrameSet[index] = true;
_absoluteJointRotationsInObjectFrameDirty[index] = true;
@ -728,8 +728,8 @@ bool RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame(int ind
bool result = false;
_jointDataLock.withWriteLock([&] {
resizeJointArrays();
if (index >= 0 && index < _absoluteJointTranslationsInObjectFrame.size() /* &&
_absoluteJointTranslationsInObjectFrame[index] != translation*/) {
if (index >= 0 && index < _absoluteJointTranslationsInObjectFrame.size() &&
_absoluteJointTranslationsInObjectFrame[index] != translation) {
_absoluteJointTranslationsInObjectFrame[index] = translation;
_absoluteJointTranslationsInObjectFrameSet[index] = true;
_absoluteJointTranslationsInObjectFrameDirty[index] = true;

2
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -909,7 +909,7 @@ bool EntityScriptingInterface::setAbsoluteJointsDataInObjectFrame(const QUuid& e
EntityItemProperties properties;
_entityTree->withWriteLock([&] {
properties = entity->getProperties();
// entity->setLastEdited(now);
entity->setLastEdited(now);
entity->setLastBroadcast(now);
});