Merge branch 'master' into hazeZone

# Conflicts: # libraries/entities-renderer/src/RenderableModelEntityItem.cpp

Nissim Hadar committed 9 years ago

Commit 4d8a1db2 parents 55fafea a1c52ea376 files · +16994 −6872Browse files

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

Unified · Split

@@ -50,8 +50,8 @@ using namespace render; · 49 unmodified lines
50	50	extern void initOverlay3DPipelines(render::ShapePlumber& plumber, bool depthTest = false);
51	51	extern void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePipeline::BatchSetter& batchSetter, const render::ShapePipeline::ItemSetter& itemSetter);
52	52
53		−RenderDeferredTask::RenderDeferredTask() {
54		− DependencyManager::set<FadeEffect>();
	53	+RenderDeferredTask::RenderDeferredTask()
	54	+{
55	55	}
56	56
57	57	void RenderDeferredTask::configure(const Config& config)

Keyboard shortcuts