Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-01-13merge with trunk/2.5 at r25907Joseph Eagar
2010-01-11SVN maintenance.Guillermo S. Romero
2010-01-10add OpenCOLLADA support to MakefilesStefan Gartner
add "export WITH_OPENCOLLADA=true" to user-def.mk to enable it
2010-01-05Merge -c 25001,25310,25311,25638,25746 from COLLADA branch into trunk.Arystanbek Dyussenov
2010-01-05COLLADA branch: bone anim export works. Export-import roundtrip is possible.Arystanbek Dyussenov
Importer now takes mesh bind position into account. TODO: read/write object-level anim on armatures and fix memleaks.
2009-12-31COLLADA branch: fixed a small bug in bone anim import code.Arystanbek Dyussenov
2009-12-13MSVC 9 compile fixes and cleanupsAndrea Weikert
* added renamed files in revision 25337 * renamed BLI_util.h -> BLI_path_util.h for consistency * cleanup of #includes: removed BLI_blenlib.h in favour of direct includes of the needed headerfiles in a few places. * removed debug print in sequencer.c * added missing include in blenkernel/blender.c -> bad dependency, needs to be fixed still
2009-12-11COLLADA branch: patch from Jan Diederich for bump-map export via <extra> tag.Arystanbek Dyussenov
2009-12-11COLLADA branch: small code clean-ups in bone anim export. Correct bone anim ↵Arystanbek Dyussenov
export is to be done yet.
2009-11-29Merge from COLLADA branch into trunk of -c 24572 (cmake and scons for ↵Arystanbek Dyussenov
OpenCollada @ 675, Linux) and 25001 (bone animation import). See corresponding log entries for more detail.
2009-11-29Merge from trunk -r 24758:25003.Arystanbek Dyussenov
2009-11-29COLLADA branch: bone animation import works!Arystanbek Dyussenov
Here's the doc describing how it works: http://wiki.blender.org/index.php/User:Kazanbas/Collada_Animation_Import Here's a video showing it at work: http://vimeo.com/7877617
2009-11-25add access to bone add/remove from rna. eg.Campbell Barton
bone = arm.edit_bones.new("SomeBone") arm.edit_bones.remove(bone) regify (WIP)
2009-11-24Fix for last commit, forgot to update collada.Brecht Van Lommel
2009-11-18rename pose_channels to bonesCampbell Barton
was: object.pose.pose_channels["Bone"] now: object.pose.bones["Bone"]
2009-11-13Merge -c 24547 from COLLADA branch (fix flipping of triangles created by ↵Arystanbek Dyussenov
tesselation).
2009-11-12Merge -c 24531 from COLLADA branch (fix holes in imported meshes).Arystanbek Dyussenov
2009-11-12Merged -c 24514 from COLLADA branch (build edges on mesh import).Arystanbek Dyussenov
2009-11-11Fix CMake build system for WindowsErwin Coumans
Add support for OPTION WITH_OPENCOLLADA for Windows
2009-11-10Math LibBrecht Van Lommel
* Convert all code to use new functions. * Branch maintainers may want to skip this commit, and run this conversion script instead, if they use a lot of math functions in new code: http://www.pasteall.org/9052/python
2009-11-09Mac :Damien Plisson
- scons update to build with openCollada - scons & cmake update for render optimization cflags
2009-11-07Merge -c 24393 (patch by Jan) from COLLADA branch.Arystanbek Dyussenov
2009-11-04Merging change 24311 from COLLADA branch into trunk which should fix ↵Arystanbek Dyussenov
object-based rotation import/export. Bone rotation animation not fixed yet.
2009-11-02Mac :Damien Plisson
- Updated CMake files for building with openCollada Update of the 10.5 libs including openCollada is coming in next commit
2009-10-30Merge of the COLLADA GSoC branch into trunk.Arystanbek Dyussenov
COLLADA code is disabled by default (it has dependencies requiring manual install). SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch. The detailed command log of the merge (can be useful for educational purposes): branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook # collada code svn copy $branch/source/blender/collada source/blender/collada # operator svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c # menu svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py # scons svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript # cmake svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt