merge with trunk at r31523
[blender.git] / source / blender / gpu / intern / gpu_shader_material.glsl.c
2010-09-04 Joseph Eagarmerge with trunk at r31523
2010-08-06 Tom Musgroveafter discussion with brecht reverting this commit...
2010-08-06 Tom MusgroveCommitting Konrads GLSL preview of bumpmapping, now...
2010-08-05 Joerg Muellersvn merge -r 30954:31059 https://svn.blender.org/svnroo...
2010-08-03 Tom Musgroveremoving the f so that glsl shaders work on older cards
2010-07-30 Joerg Muellersvn merge -r 30718:30912 https://svn.blender.org/svnroo...
2010-07-29 Brecht Van LommelFix #23073: glsl and 3d view background color didn...
2010-07-19 Joseph Eagarpart 1 of merge from trunk at r30358; it compiles,...
2010-06-19 Joerg MuellerRecreating my GSoC branch.
2010-06-19 Joerg MuellerDeleting my GSoC branch to recreate it.
2010-01-24 Campbell Bartoncopy of docs from 2.4x for python modules that have...
2009-11-22 Joseph Eagarmerge with trunk/2.5 at r24463
2009-11-16 Campbell Bartonpython api for ID property access by Joseph Eager,...
2009-11-12 Arystanbek DyussenovCOLLADA: merge from trunk -r 24390:24522.
2009-11-11 Brecht Van LommelSculpt: svn merge https://svn.blender.org/svnroot/bf...
2009-11-09 Campbell Bartonmaterial shader curve factor (same as compo node)
2009-11-01 Joseph Eagarcommit before doing some hefty shapekey change, will...
2009-10-25 Arystanbek DyussenovMerge from trunk -r 23000:23968.
2009-10-19 Brecht Van LommelFix #19632: GLSL was not updated for soft/linear light...
2009-10-19 Brecht Van LommelFix #19622: crash in glsl, forgot to commit this file...
2009-01-07 Joseph Eagarrebranch from 2.5
2008-11-12 Brecht Van LommelMerge of trunk into blender 2.5:
2008-10-02 Martin Poiriermerge trunk 16118 -> 116886
2008-09-19 Andre Susano PintoMerge from trunk
2008-09-19 Andre Susano PintoRevert last merge from trunk
2008-09-15 Andre Susano Pintosvn merge -r 16231:16536 https://svn.blender.org/svnroo...
2008-09-10 Daniel Genrichsvn merge -r 16369:16454 https://svn.blender.org/svnroo...
2008-09-07 Daniel GenrichSome version were not merged from svn/missing --> svn...
2008-09-06 Benoit Bolseesvn merge -r 16371:16396 https://svn.blender.org/svnroo...
2008-09-05 Brecht Van LommelGLSL: small optimization if Use Alpha is disabled for...
2008-09-05 Brecht Van LommelBugfix for GLSL: no specular/diffuse + only shadow...
2008-09-05 Daniel Genrichsvn merge -r 16320:16369 https://svn.blender.org/svnroo...
2008-09-04 Daniel Genrichsvn merge -r 16351:16368 https://svn.blender.org/svnroo...
2008-09-04 Brecht Van LommelMerge ... first part of changes from the apricot branch...