svn merge ^/trunk/blender -r42940:42953
[blender-staging.git] / source / blender / gpu / intern / gpu_shader_material.glsl
2011-12-28 Campbell Bartonsvn merge ^/trunk/blender -r42940:42953
2011-12-28 Brecht Van LommelFix #29715: cycles and glsl normal node not working...
2011-12-15 Campbell Bartonsvn merge ^/trunk/blender -r42617:42655
2011-12-15 Antony RiakiotakisBicubic bump map filtering.
2011-12-02 Sergey SharybinMerging r42193 through r42349 from trunk into soc-2011...
2011-12-02 Campbell Bartonsvn merge ^/trunk/blender -r42303:42329
2011-12-01 Brecht Van LommelCycles: fix glsl error when using light path node.
2011-11-22 Sergey SharybinMerging r41937 through r42061 from trunk into soc-2011...
2011-11-22 Campbell Bartonsvn merge ^/trunk/blender -r42009:42053
2011-11-20 Bastien MontagneMuting node patch: second part. Also fix [#27636] Mutin...
2011-11-16 Sergey SharybinMerged trunk up to rev41928
2011-11-15 Campbell Bartonsvn merge -r41779:41847 ^/trunk/blender
2011-11-14 Brecht Van LommelCycles: Oren-Nayar BSDF support. This is not a separate...
2011-11-14 Brecht Van LommelFix #29252: GLSL not working with geometry material...
2011-11-10 Campbell Bartonsvn merge -r41649:41650 ^/trunk/blender
2011-11-09 Miika HamalainenMerge with trunk r41701
2011-11-08 Brecht Van LommelNodes: add cycles shader nodes, these will only be...
2011-11-07 Brecht Van LommelCycles: svn merge -r41613:41627 ^/trunk/blender
2011-11-07 Brecht Van LommelCycles: svn merge -r41531:41613 ^/trunk/blender
2011-11-04 Brecht Van LommelCycles: svn merge -r41467:41531 ^/trunk/blender
2011-11-02 Brecht Van LommelCycles: svn merge -r41266:41467 ^/trunk/blender
2011-10-24 Brecht Van LommelCycles: svn merge -r41232:41266 ^/trunk/blender
2011-10-24 Brecht Van LommelCycles: svn merge -r41225:41232 ^/trunk/blender
2011-10-24 Brecht Van LommelCycles: svn merge -r41205:41225 ^/trunk/blender
2011-10-22 Brecht Van LommelCycles: svn merge -r41182:41205 ^/trunk/blender
2011-10-21 Brecht Van LommelCycles: svn merge -r41157:41182 ^/trunk/blender
2011-10-21 Brecht Van LommelCycles: svn merge -r40934:41157 ^/trunk/blender
2011-10-12 Brecht Van LommelCycles: revert commit that joined surface/volume socket...
2011-10-12 Brecht Van LommelCycles: replace surface/volume sockets in output nodes...
2011-10-11 Brecht Van LommelCycles: svn merge -r40411:40934 ^/trunk/blender
2011-09-20 Brecht Van LommelCycles: svn merge -r40358:40411 ^/trunk/blender
2011-09-20 Miika HamalainenMerge with trunk r40409
2011-09-19 Brecht Van LommelCycles: svn merge -r40266:40358 https://svn.blender...
2011-09-17 Brecht Van LommelCycles: svn merge -r39870:r40266 https://svn.blender...
2011-09-16 Brecht Van LommelCycles: tweaks to properties and nodes
2011-09-15 Sergey SharybinMerging trunk into soc-2011-tomato up to revision 40241
2011-09-15 Sergey Sharybinsvn merge -r39834:40222 https://svn.blender.org/svnroot...
2011-09-13 Campbell Bartonsvn merge -r40000:40179 https://svn.blender.org/svnroot...
2011-09-13 Campbell Bartonsvn merge -r39558:39800 https://svn.blender.org/svnroot...
2011-09-09 Benoit BolseeBGE: merge Recast & Detour branch (sock-2010-nicks).
2011-09-09 Benoit Bolseesvn merge -r 40061:40078 https://svn.blender.org/svnroo...
2011-09-09 Campbell Bartonsvn merge -r40051:40075 https://svn.blender.org/svnroot...
2011-09-09 Benoit Bolseesvn merge -r 39975:40061 https://svn.blender.org/svnroo...
2011-09-09 Benoit BolseeGPU: add gpu python module with export_shader() functio...
2011-09-07 Benoit Bolseesvn merge -r 37306:39975 https://svn.blender.org/svnroo...
2011-09-02 Brecht Van LommelCycles: svn merge -r39669:39870 https://svn.blender...
2011-09-01 Bastien MontagneMerging r39652 through r39842 from trunk into vgroup_mo...
2011-09-01 Xiao Xiangquanmerge with trunk r39834
2011-08-30 Joerg Mueller* Merge trunk up to r39790.
2011-08-28 Miika HamalainenMerge with trunk r39750
2011-08-26 Sergey SharybinMerging r39634 through r39716 from trunk into soc-2011...
2011-08-24 Brecht Van LommelCycles: svn merge -r39457:39669 https://svn.blender...
2011-08-24 Campbell Bartonsvn merge -r39493:39664 https://svn.blender.org/svnroot...
2011-08-23 Brecht Van LommelFix #28343: glsl error after derivative maps commit.
2011-08-23 Bastien MontagneMerging r39486 through r39651 from trunk into vgroup_mo...
2011-08-22 Joerg MuellerMerging trunk up to r39637.
2011-08-22 Morten Mikkelsenglsl and render support for derivative maps
2011-08-07 Brecht Van LommelCycles: svn merge -r37957:39132 https://svn.blender...
2011-07-16 Joshua LeungBugfix [#27157] keyframing a constrained bone does...
2011-06-29 Brecht Van LommelCycles: svn merge -r37904:37957 https://svn.blender...
2011-06-28 Brecht Van LommelCycles: svn merge -r37694:37904 https://svn.blender...
2011-06-27 Brecht Van LommelCycles: working towards texture workflow design
2011-06-21 Brecht Van LommelCycles: svn merge -r37333:37694 https://svn.blender...
2011-06-10 Brecht Van LommelCycles: quick GLSL stubs for new material nodes, so...
2011-06-08 Mike Erwinmigrated NDOF code from soc-2010-merwin, SpaceNavigator...
2011-06-07 Benoit Bolseesvn merge -r 37212:37306 https://svn.blender.org/svnroo...
2011-06-05 Nick Samarinsynched with trunk at revision 37212
2011-05-16 Nick Samarinsynched with trunk at revision 36569
2011-05-12 Campbell Bartonmanually copy more changes from trunk.
2011-05-12 Campbell Bartonsvn merge -r36603:36628 https://svn.blender.org/svnroot...
2011-05-11 Campbell Bartonsvn merge -r36583:36603 https://svn.blender.org/svnroot...
2011-05-10 Campbell Bartonsvn merge -r36564:36583 https://svn.blender.org/svnroot...
2011-05-09 Campbell Bartonsvn merge -r36529:36564 https://svn.blender.org/svnroot...
2011-05-08 Joseph Eagar=bmesh= merge from trunk at r36529
2011-05-05 Brecht Van LommelCycles: svn merge -r36352:36495 https://svn.blender...
2011-05-02 Brecht Van LommelFix #26807: glsl diffuse/specular was not clamping...
2011-04-15 Joseph Eagar=bmesh= merge from trunk at r36153
2011-02-27 Joseph Eagarmerge with/from trunk at r35190
2011-02-23 M.G. Kishalmisince the introduction of 'newbump' blender
2011-02-16 Nick Samarinsynched with trunk at revision 34793
2011-02-16 Nick Samarinsynched with trunk at revision 34793
2011-02-16 Nick Samarinsynched with trunk at revision 34793
2011-02-16 Nick Samarinsynched with trunk at revision 34793
2011-02-16 Nick Samarinsynched with trunk at revision 34793
2011-02-14 M.G. KishalmiThis commit will switch blender to use tangent space...
2011-02-08 M.G. Kishalmifix: latest shader wasn't working on itel gfx-cards
2011-02-07 M.G. KishalmiGLSL shader part
2011-01-30 M.G. Kishalmimoved texture_space scaling factor from glsl to C.
2011-01-30 M.G. Kishalmibugfix #25867
2011-01-30 Ton RoosendaalFix for object-space bumpmapping in GLSL. Fix provided
2011-01-29 Ton RoosendaalFixes for GLSL bump code; it was using calls not suppor...
2011-01-29 M.G. Kishalmimatching 3Dview GLSL shaders for the new bumpmapping...
2010-09-07 Joseph Eagarmerge from trunk at r31523
2010-09-04 Joseph Eagarmerge with trunk at r31523
2010-08-07 Mike Erwinmerged 30707:31141 from trunk
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 Nick Samarinsynched with trunk at revision 31065
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
next