Collada: commented out code was previously left over with an unresolved conflict...
[blender.git] / source / blender / collada / ArmatureImporter.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
2016-09-26 Bastien MontagneMerge branch 'master' into blender2.8
2016-09-23 Gaia ClaryFix: Collada Importer did not import the Blender Profil...
2016-09-22 Julian EiselMerge branch 'master' into blender2.8
2016-09-20 Gaia Claryregression fix for 1346482d23f167fa57049128384246397fda...
2016-06-07 Bastien MontagneMerge branch 'master' into blender2.8
2016-06-03 Gaia Clarychanged use_connect from bool to a 3 state value (...
2016-06-01 Bastien MontagneMerge branch 'master' into blender2.8
2016-05-28 Gaia ClaryAdded support for non numeric bone layer labels (could...
2016-05-28 Gaia ClaryCollada: Adding support for bone roll and bone layers
2016-05-26 Gaia Clarymoved is_leaf_bone() to collada utils for reuse in...
2016-05-26 Gaia Claryfix: Import of meshes with holes is now reported as...
2014-12-01 Gaia ClaryCollada Importer: Separated finding bone chains and...
2014-12-01 Gaia ClaryImproved Collada Armature Import
2013-07-31 Thomas DingesCycles / HSV Separator and Combine node:
2013-07-17 Thomas DingesMerged revision(s) 58241-58355 from trunk/blender into...
2013-07-17 Mitchell StokesMerging changes from trunk r58091-58323.
2013-07-15 Sergey SharybinMerging r58196 through r58265 from trunk into soc-2013...
2013-07-14 Gaia Claryfix: #36060 Collada Import: animated armature+mesh...
2013-07-14 Thomas DingesMerged revision(s) 58226-58240 from trunk/blender into...
2013-07-14 Gaia ClaryRemoved unused paramter from ArmatureImporter:add_joint()
2013-07-09 Mitchell StokesCreating a BGE staging branch.
next