Collada: commented out code was previously left over with an unresolved conflict...
[blender.git] / source / blender / collada / SkinInfo.h
2018-02-27 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-27 Campbell BartonMerge branch 'master' into blender2.8
2018-02-27 Campbell BartonMerge branch 'master' into blender2.8
2018-02-26 Gaia ClaryMerge branch 'master' into blender2.8
2018-02-26 Gaia Clarymerge from master
2018-02-24 Gaia Clarymerged collada rework from master into blender 2.8
2018-02-24 Kévin DietrichMerge branch 'master' into blender2.8
2018-02-23 Brecht Van LommelMerge branch 'master' into blender2.8
2018-02-23 Campbell BartonMerge branch 'master' into blender2.8
2018-02-23 Campbell BartonMerge branch 'master' into blender2.8
2018-02-22 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-22 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-22 Bastien MontagneMerge branch 'master' into blender2.8
2018-02-22 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-22 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-22 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-22 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-22 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-21 Brecht Van LommelMerge branch 'master' into blender2.8
2018-02-21 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-21 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-19 Campbell BartonMerge branch 'master' into blender2.8
2018-02-19 Campbell BartonMerge branch 'master' into blender2.8
2018-02-18 Brecht Van LommelMerge branch 'master' into blender2.8
2018-02-18 Campbell BartonMerge branch 'master' into blender2.8
2018-02-17 Brecht Van LommelMerge branch 'master' into blender2.8
2018-02-16 Bastien MontagneMerge branch 'master' into blender2.8
2018-02-15 Brecht Van LommelMerge branch 'master' into blender2.8
2018-02-15 Campbell BartonMerge branch 'master' into blender2.8
2018-02-15 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-15 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-15 Campbell BartonMerge branch 'master' into blender2.8
2018-02-14 Brecht Van LommelMerge branch 'master' into blender2.8
2018-02-14 Brecht Van LommelMerge branch 'master' into blender2.8
2018-02-14 Campbell BartonMerge branch 'master' into blender2.8
2018-02-13 Campbell BartonMerge branch 'master' into blender2.8
2018-02-12 Campbell BartonMerge branch 'master' into blender2.8
2018-02-12 Campbell BartonMerge branch 'master' into blender2.8
2018-02-09 Brecht Van LommelMerge branch 'master' into blender2.8
2018-02-09 Bastien MontagneMerge branch 'master' into blender2.8
2018-02-09 Bastien MontagneMerge branch 'master' into blender2.8
2018-02-09 Bastien MontagneMerge branch 'master' into blender2.8
2018-02-09 Campbell BartonMerge branch 'master' into blender2.8
2018-02-08 Tamito KajiyamaMerge branch 'master' into blender2.8
2018-02-08 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-08 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-08 Campbell BartonMerge branch 'master' into blender2.8
2018-02-08 Campbell BartonMerge branch 'master' into blender2.8
2018-02-07 Bastien MontagneMerge branch 'master' into blender2.8
2018-02-07 Bastien MontagneMerge branch 'master' into blender2.8
2018-02-07 Bastien MontagneMerge branch 'master' into blender2.8
2018-02-07 Brecht Van LommelMerge branch 'master' into blender2.8
2018-02-07 Campbell BartonMerge branch 'master' into blender2.8
2018-02-07 Campbell BartonMerge branch 'master' into blender2.8
2018-02-06 Campbell BartonMerge branch 'master' into blender2.8
2018-02-06 Campbell BartonMerge branch 'master' into blender2.8
2018-02-05 Campbell BartonMerge branch 'master' into blender2.8
2018-02-03 Campbell BartonMerge branch 'master' into blender2.8
2018-02-03 Brecht Van LommelMerge branch 'master' into blender2.8
2018-02-02 Sergey SharybinMerge branch 'master' into blender2.8
2018-02-02 Campbell BartonMerge branch 'master' into blender2.8
2018-02-01 Dalai FelintoMerge remote-tracking branch 'origin/master' into blend...
2018-02-01 Campbell BartonMerge branch 'master' into blender2.8
2018-02-01 Campbell BartonMerge branch 'master' into blender2.8
2018-02-01 Campbell BartonMerge branch 'master' into blender2.8
2018-02-01 GermanoMerge branch 'master' into blender2.8
2018-02-01 GermanoMerge branch 'master' into blender2.8
2018-01-31 Gaia ClaryMerge branch 'master' into blender2.8
2018-01-31 Bastien MontagneMerge branch 'master' into blender2.8
2018-01-31 Sergey SharybinMerge branch 'master' into blender2.8
2018-01-31 Campbell BartonMerge branch 'master' into blender2.8
2018-01-30 Sergey SharybinMerge branch 'master' into blender2.8
2018-01-29 Campbell BartonMerge branch 'master' into blender2.8
2018-01-28 Bastien MontagneMerge branch 'master' into blender2.8
2018-01-28 Campbell BartonMerge branch 'master' into blender2.8
2018-01-28 Campbell BartonMerge branch 'master' into blender2.8
2018-01-28 Campbell BartonMerge branch 'master' into blender2.8
2018-01-28 Campbell BartonMerge branch 'master' into blender2.8
2018-01-26 Gaia Claryfix:T53271 now using the context scene layer as requested
2013-07-09 Mitchell StokesCreating a BGE staging branch.
2013-02-25 Sergey Sharybincode cleanup: remove unused and unsupported functions...
2013-02-25 Sergey SharybinCamera tracking: libmv distortion API now also uses...
2012-12-19 Tamito KajiyamaMerged changes in the trunk up to revision 53146.
2012-12-11 Campbell Bartondefine the size of matrix args for both rows/cols.
2012-05-11 Tamito KajiyamaMerged changes in the trunk up to revision 46557.
2012-05-09 Ove Murberg Henriksensvn merge ^/trunk/blender -r45927:HEAD --accept=theirs...
2012-05-08 Ove Murberg Henriksenmerging back to a version that works...
2012-05-08 Sergey SharybinMerging r46203 through r46413 from trunk into soc-2011...
2012-05-07 Ove Murberg Henriksensvn merge ^/trunk/blender -r46300:46330
2012-05-05 Campbell Bartoncode cleanup: naming - pose/armature/image
2012-02-18 Sergey SharybinMerging r44140 through r44226 from trunk into soc-2011...
2012-02-18 Tamito KajiyamaMerged changes in the trunk up to revision 44221.
2012-02-17 Campbell Bartonsvn merge ^/trunk/blender -r44189:44204
2012-02-17 Campbell Bartonunify include guard defines, __$FILENAME__
2011-10-30 Tamito KajiyamaMerged changes in the trunk up to revision 41368.
2011-10-28 Miika HamalainenMerge with trunk r41342
2011-10-24 Brecht Van LommelCycles: svn merge -r41225:41232 ^/trunk/blender
2011-10-24 Sergey SharybinMerging trunk up to revision 41245.
2011-10-24 Campbell Bartonsvn merge ^/trunk/blender -r41226:41227 .
2011-10-23 Campbell Bartonremove $Id: tags after discussion on the mailign list...
next