Merge remote-tracking branch 'upstream/stable' into android_stable

Brad Davis committed 8 years ago

Commit aeb29db2 parents 4e2d3f2 43afd25339 files · +6081 −33096Browse files

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

Unified · Split

libraries/render-utils/src/AnimDebugDraw.cpp+1−1

@@ -68,7 +68,7 @@ public: · 67 unmodified lines
68	68	typedef render::Payload<AnimDebugDrawData> AnimDebugDrawPayload;
69	69
70	70	namespace render {
71		− template <> const ItemKey payloadGetKey(const AnimDebugDrawData::Pointer& data) { return (data->_isVisible ? ItemKey::Builder::opaqueShape() : ItemKey::Builder::opaqueShape().withInvisible()); }
	71	+ template <> const ItemKey payloadGetKey(const AnimDebugDrawData::Pointer& data) { return (data->_isVisible ? ItemKey::Builder::opaqueShape() : ItemKey::Builder::opaqueShape().withInvisible()).withTagBits(ItemKey::TAG_BITS_ALL); }
72	72	template <> const Item::Bound payloadGetBound(const AnimDebugDrawData::Pointer& data) { return data->_bound; }
73	73	template <> void payloadRender(const AnimDebugDrawData::Pointer& data, RenderArgs* args) {
74	74	data->render(args);