rename qvector findRayIntersection to avoid script conflicts

SamGondelman committed 9 years ago

Commit a641fb71 parent 9bb7e667 files · +27 −27Browse files

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

Unified · Split

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

@@ -682,10 +682,10 @@ RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersection(cons · 681 unmodified lines
682	682	QVector<EntityItemID> entitiesToInclude = qVectorEntityItemIDFromScriptValue(entityIdsToInclude);
683	683	QVector<EntityItemID> entitiesToDiscard = qVectorEntityItemIDFromScriptValue(entityIdsToDiscard);
684	684
685		− return findRayIntersection(ray, precisionPicking, entitiesToInclude, entitiesToDiscard, visibleOnly, collidableOnly);
	685	+ return findRayIntersectionVector(ray, precisionPicking, entitiesToInclude, entitiesToDiscard, visibleOnly, collidableOnly);
686	686	}
687	687
688		−RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersection(const PickRay& ray, bool precisionPicking,
	688	+RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersectionVector(const PickRay& ray, bool precisionPicking,
689	689	const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) {
690	690	PROFILE_RANGE(script_entities, __FUNCTION__);
691	691