Attachment #82461 for bug #126191

Lines 790-796 Link Here

(-)Tools/XMLConverter/include/tinyxml.h.old (-1 / +1 lines)
790	#endif	790	#endif
791		791
792	/// Construct.	792	/// Construct.
793	TiXmlDeclaration::TiXmlDeclaration( const char * _version,	793	TiXmlDeclaration( const char * _version,
794	const char * _encoding,	794	const char * _encoding,
795	const char * _standalone );	795	const char * _standalone );
796		796

Lines 196-203 Link Here

(-)PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h.old (-2 / +2 lines)
196	/** Overridden from SceneManager */	196	/** Overridden from SceneManager */
197	void clearScene(void);	197	void clearScene(void);
198		198
199	AxisAlignedBoxSceneQuery* OctreeSceneManager::createAABBQuery(const AxisAlignedBox& box, unsigned long mask);	199	AxisAlignedBoxSceneQuery* createAABBQuery(const AxisAlignedBox& box, unsigned long mask);
200	SphereSceneQuery* OctreeSceneManager::createSphereQuery(const Sphere& sphere, unsigned long mask);	200	SphereSceneQuery* createSphereQuery(const Sphere& sphere, unsigned long mask);
201	PlaneBoundedVolumeListSceneQuery* createPlaneBoundedVolumeQuery(const PlaneBoundedVolumeList& volumes, unsigned long mask);	201	PlaneBoundedVolumeListSceneQuery* createPlaneBoundedVolumeQuery(const PlaneBoundedVolumeList& volumes, unsigned long mask);
202	RaySceneQuery* createRayQuery(const Ray& ray, unsigned long mask);	202	RaySceneQuery* createRayQuery(const Ray& ray, unsigned long mask);
203	IntersectionSceneQuery* createIntersectionQuery(unsigned long mask);	203	IntersectionSceneQuery* createIntersectionQuery(unsigned long mask);

Lines 101-107 Link Here

(-)OgreMain/include/OgreHardwareOcclusionQuery.h.old (-1 / +1 lines)
101	* Lets you know when query is done, or still be processed by the Hardware	101	* Lets you know when query is done, or still be processed by the Hardware
102	* @return true if query isn't finished.	102	* @return true if query isn't finished.
103	*/	103	*/
104	virtual bool HardwareOcclusionQuery::isStillOutstanding(void) = 0;	104	virtual bool isStillOutstanding(void) = 0;
105		105
106		106
107	//----------------------------------------------------------------------	107	//----------------------------------------------------------------------

Return to bug 126191