Fix for one-frame lag in the tablet stylus.

Anthony J. Thibault committed 9 years ago

Commit 0962a151 parent 5a0990f4 files · +8 −7Browse files

Showing the changes to libraries/render-utils/src/Model.cpp (1 of 4 files). Show all

Unified · Split

@@ -133,16 +133,15 @@ void Model::setRotation(const glm::quat& rotation) { · 132 unmodified lines
133	133	updateRenderItems();
134	134	}
135	135
136		−void Model::setSpatiallyNestableOverride(SpatiallyNestablePointer override) {
	136	+void Model::setSpatiallyNestableOverride(SpatiallyNestable* override) {
137	137	_spatiallyNestableOverride = override;
138	138	updateRenderItems();
139	139	}
140	140
141	141	Transform Model::getTransform() const {
142		− SpatiallyNestablePointer spatiallyNestableOverride = _spatiallyNestableOverride.lock();
143		− if (spatiallyNestableOverride) {
	142	+ if (_spatiallyNestableOverride) {
144	143	bool success;
145		− Transform transform = spatiallyNestableOverride->getTransform(success);
	144	+ Transform transform = _spatiallyNestableOverride->getTransform(success);
146	145	if (success) {
147	146	transform.setScale(getScale());
148	147	return transform;