git.six.silmor.de Git - konrad/qtdeclarative.git/commit

projects / konrad/qtdeclarative.git / commit

author	Alan Alpert <alan.alpert@nokia.com>
	Mon, 22 Aug 2011 09:00:16 +0000 (19:00 +1000)
committer	Qt by Nokia <qt-info@nokia.com>
	Wed, 24 Aug 2011 02:23:40 +0000 (04:23 +0200)
commit	d469d39a92cda540adeb9c36b533781c4a801b75
tree	ebab0bafa74de0d45c8a84ca1afb41f4e7380b02	tree \| snapshot
parent	2d0477537e1a0c06572ef24736ce13d7f56350e6	commit \| diff

Switch to using one shader and #ifdefs

Also clean up the shader code a little

Change-Id: I98062ae729c145901e1d218a698672672ca1bf26
Reviewed-on: http://codereview.qt.nokia.com/3298
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

src/declarative/particles/defaultshaders/imagefragment.shader	[new file with mode: 0644]	blob
src/declarative/particles/defaultshaders/imagevertex.shader	[new file with mode: 0644]	blob
src/declarative/particles/defaultshaders/spritevertex.shader		diff \| blob \| history
src/declarative/particles/particles.qrc		diff \| blob \| history
src/declarative/particles/qsgimageparticle.cpp		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom