summaryrefslogtreecommitdiffstats
path: root/src/render/defaults/qnormaldiffusemapalphamaterial.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5.6' into 5.7Sean Harmer2016-04-161-1/+1
|\
| * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-011-1/+1
* | Unify license header usageAntti Kokko2016-01-261-11/+14
|/
* Rename Renderer -> Render throughoutSean Harmer2015-10-191-2/+2
* Move Qt3DCore into Qt3DCore namespaceSean Harmer2015-10-131-1/+1
* Move Render aspect into the Qt3DRender namespaceSean Harmer2015-10-131-6/+6
* Copyright header change.Mika Salmela2015-02-091-19/+14
* Default cpp materials + material-cpp examplePaul Lemire2014-12-311-0/+68