working circle lighting
working circle lighting
Merge remote-tracking branch 'origin/master'

Conflicts:
	Debug/ScenegraphWithLightsTextures.exe
	Debug/ScenegraphWithLightsTextures.ilk
	Debug/ScenegraphWithLightsTextures.pdb
	ScenegraphWithLightsTextures.sdf
	ScenegraphWithLightsTextures.v11.suo
	ScenegraphWithLightsTextures/Debug/CL.read.1.tlog
	ScenegraphWithLightsTextures/Debug/CL.write.1.tlog
	ScenegraphWithLightsTextures/Debug/Light.obj
	ScenegraphWithLightsTextures/Debug/Scenegraph.obj
	ScenegraphWithLightsTextures/Debug/ScenegraphViewer.obj
	ScenegraphWithLightsTextures/Debug/ScenegraphWithLightsTextures.log
	ScenegraphWithLightsTextures/Debug/Texture.obj
	ScenegraphWithLightsTextures/Debug/View.obj
	ScenegraphWithLightsTextures/Debug/vc110.idb
	ScenegraphWithLightsTextures/Debug/vc110.pdb
	ScenegraphWithLightsTextures/LeafNode.h
	ScenegraphWithLightsTextures/View.cpp
	ScenegraphWithLightsTextures/image.png