adapting to entitypointer merge

Seth Alves committed 11 years ago

Commit df795cf1 parent c80f2971 file · +2 −2Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−2

@@ -389,7 +389,7 @@ bool EntityScriptingInterface::setVoxelSphere(QUuid entityID, const glm::vec3& c · 388 unmodified lines
389	389	return false;
390	390	}
391	391
392		− EntityItem* entity = const_cast<EntityItem*>(_entityTree->findEntityByEntityItemID(entityID));
	392	+ EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));
393	393	if (!entity) {
394	394	qCDebug(entities) << "EntityScriptingInterface::setVoxelSphere no entity with ID" << entityID;
395	395	return false;
@@ -402,7 +402,7 @@ bool EntityScriptingInterface::setVoxelSphere(QUuid entityID, const glm::vec3& c · 6 unmodified lines
402	402
403	403	auto now = usecTimestampNow();
404	404
405		− PolyVoxEntityItem* polyVoxEntity = static_cast<PolyVoxEntityItem*>(entity);
	405	+ PolyVoxEntityItem* polyVoxEntity = static_cast<PolyVoxEntityItem*>(entity.get());
406	406	_entityTree->lockForWrite();
407	407	polyVoxEntity->setSphere(center, radius, value);
408	408	entity->setLastEdited(now);