1c031d968b
Merge -c 28089 from COLLADA branch into trunk.
2010-04-08 11:57:23 +00:00
ea7fdb55a3
Compile fix to collada after ED_object_apply_obmat() was removed.
...
Arystanbek, please feel free to fix if it's not ok :)
2010-04-06 02:05:02 +00:00
35c0e5052a
Merge -c 28014 from COLLADA branch into trunk.
2010-04-05 15:47:57 +00:00
f87f5d67ed
Merge -c 27903 from COLLADA branch into trunk.
2010-03-31 15:04:46 +00:00
b356eb6a8b
image re-project now uses offscreen render function and has input for render size.
...
unrelated changes that ended up being more trouble to commit separate...
- removed BLI_split_dirfile(), was nasty, occasionaly modifying the source string, it could create directories and used the $CWD in some cases. was only used in 2 places in filesel.c, if this gives problems can address without bringing back this function.
renamed BLI_split_dirfile_basic --> BLI_split_dirfile
- view3d_operator_needs_opengl was being called for offscreen render when it wasnt needed.
2010-03-08 20:08:04 +00:00
b3d41ac144
Merge -c 26897,26932 from COLLADA branch into trunk.
2010-02-15 16:18:21 +00:00
b43f107195
Merge -c 26848 from COLLADA branch into trunk.
2010-02-12 20:32:36 +00:00
1f863d0122
COLLADA branch: merge from trunk -r 25745:26429.
...
scons+vc build crashes on Blender start when BF_COLLADA is on, don't know why this happens.
Merging from trunk to get working vc project files, then will try to debug and locate the problem.
2010-01-30 14:12:51 +00:00
e307f6c6a0
rename defgroup functions to be more consistant.
...
* no functional changes *
2010-01-26 13:50:17 +00:00
6695334377
COLLADA branch: patch for importer from Sergey I. Sharybin to build against OpenCollada at revision 721. Thanks Sergey!
...
People who want to build this branch will need update their OpenCollada.
On Linux OpenCollada builds without patching. As usual I updated the build doc: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch#Building_the_COLLADA_GSoC_branch
A small change will be necessary in cmake and scons options on Mac and Windows: OpenCollada's libBuffer was renamed to libbuffer.
2010-01-23 17:33:40 +00:00
1bca8389dd
Merge from trunk -r 25003:25745.
2010-01-05 19:21:59 +00:00
0a0d43a926
Merge -c 25001,25310,25311,25638,25746 from COLLADA branch into trunk.
2010-01-05 17:42:01 +00:00
06d548bd6f
COLLADA branch: bone anim export works. Export-import roundtrip is possible.
...
Importer now takes mesh bind position into account.
TODO: read/write object-level anim on armatures and fix memleaks.
2010-01-05 16:07:10 +00:00
18eb6d9827
COLLADA branch: fixed a small bug in bone anim import code.
2009-12-31 14:31:42 +00:00
ca16488e81
MSVC 9 compile fixes and cleanups
...
* 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-13 17:46:30 +00:00
92b4316708
Merge from COLLADA branch into trunk of -c 24572 (cmake and scons for OpenCollada @ 675, Linux) and 25001 (bone animation import). See corresponding log entries for more detail.
2009-11-29 19:16:52 +00:00
71a2cc3222
Merge from trunk -r 24758:25003.
2009-11-29 18:54:37 +00:00
ead79e535d
COLLADA branch: bone animation import works!
...
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-29 14:38:50 +00:00
b40307df16
add access to bone add/remove from rna. eg.
...
bone = arm.edit_bones.new("SomeBone")
arm.edit_bones.remove(bone)
regify (WIP)
2009-11-25 11:05:11 +00:00
284f66acf7
Fix for last commit, forgot to update collada.
2009-11-24 12:35:06 +00:00
67c295da9c
rename pose_channels to bones
...
was: object.pose.pose_channels["Bone"]
now: object.pose.bones["Bone"]
2009-11-18 11:40:55 +00:00
6df83fba02
Merge -c 24547 from COLLADA branch (fix flipping of triangles created by tesselation).
2009-11-13 15:48:45 +00:00
fdcc0ff7c7
Merge -c 24531 from COLLADA branch (fix holes in imported meshes).
2009-11-12 17:08:32 +00:00
0adfc00e40
Merged -c 24514 from COLLADA branch (build edges on mesh import).
2009-11-12 03:41:41 +00:00
37e4a311b0
Math Lib
...
* 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-10 20:43:45 +00:00
b36c4f3987
Merging change 24311 from COLLADA branch into trunk which should fix object-based rotation import/export. Bone rotation animation not fixed yet.
2009-11-04 15:25:57 +00:00
31258507d0
Merge of the COLLADA GSoC branch into trunk.
...
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
2009-10-30 15:35:50 +00:00
