Commit Graph

29 Commits

Author SHA1 Message Date
3bd039eff9 apply rna rename most of the show_*, names. 2010-08-17 17:03:52 +00:00
f9acf1b455 Fix bug #22828, "Exporting as COLLADA crashes Blender". 2010-08-09 18:15:50 +00:00
8e1a63dbc9 Merge -c 29322 from COLLADA branch into trunk. 2010-06-07 20:37:56 +00:00
eb50486df2 Fix COLLADA build error. This was caused by the difference in OpenCollada versions between Windows and Linux/Mac. Windows uses OpenCollada revision 746, Linux/Mac - 721. 2010-06-07 20:07:31 +00:00
05188c26ce Merge -c 29280 from COLLADA branch into trunk. 2010-06-06 19:32:12 +00:00
Nathan Letwory
a6d5f43ac8 * update CMake and SCons for the OpenCollada update (to r746).
- DocumentExporter changed due to function name change in API
  - no more UTF lib
  - enabled by default for win32

Note: debug libs will be added later, as well as 64bit windows libs.

For other platforms, get r746 of OpenCollada and build against that.
2010-06-06 00:33:59 +00:00
a545998c84 Merge -c 29009,29081,29189 from COLLADA branch into trunk. 2010-06-03 17:41:33 +00:00
80f2eb9d2b Merge -c 27876 from COLLADA branch into trunk. 2010-03-30 18:21:47 +00:00
8da10f59eb Merge -c 27223 from COLLADA branch into trunk. Vertex color export was requested and reported to work by Blake Maltby. 2010-03-11 15:37:19 +00:00
1708ac0723 rename some functions to use easier to understand names.
'BLI_makestringcode' --> 'BLI_path_rel'
'BLI_convertstringcwd' --> 'BLI_path_cwd'
'BLI_convertstringframe' --> 'BLI_path_frame'
'BLI_convertstringframe_range' --> 'BLI_path_frame_range'
'BLI_make_cwdpath' --> 'BLI_path_cwd'
2010-03-09 17:36:23 +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
878d8b44ee remove rna functions image.get_export_path() and image.get_abs_filename(), filename functions should not be spesific to images.
rename BKE_get_image_export_path() to BKE_rebase_path() and take a filename arg rather then an image.

obj export file copy was also not working because of a missing import.
2010-02-26 11:50:59 +00:00
3bf2715039 apply visual transform to pose
So constrainted bones can have their transform applied to their loc/scale/rot, then remove the constraints
2010-02-19 15:34:26 +00:00
b3d41ac144 Merge -c 26897,26932 from COLLADA branch into trunk. 2010-02-15 16:18:21 +00:00
4746fbd8ce COLLADA exporter (in trunk): write 1 normal per flat face instead of 3 or 4. 2010-02-11 14:53:29 +00:00
ebf491b111 Merge -c 26630 from COLLADA branch into trunk. 2010-02-05 18:39:04 +00:00
ea1b97a184 COLLADA branch: partial fix of bug #20634
* scale and rotation of objects with negative scale is exported correctly. This is accomplished by:
** if ob has no parent, use ob->rot, ob->scale values directly
** if ob has a parent, a local matrix is computed without scale and rotation is derived from it, scale value is copied directly from ob->size

Noted a few other bugs:
* importer suffers from negative scale problem too
* bones with negative scale are exported incorrectly too
* object animation values are copied from FCurves which is not ok for child objects where values should be in parent-space
2010-01-23 12:45:54 +00:00
799fd6f373 COLLADA branch: fix #20653 - <animation> tag's target attribute was missing ".ANGLE".
Also replaced "."s in <animation> ids with "_" and corrected bone <node> sids.
2010-01-13 12:44:57 +00:00
1bca8389dd Merge from trunk -r 25003:25745. 2010-01-05 19:21:59 +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
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
4654afb34c COLLADA branch: patch from Jan Diederich for bump-map export via <extra> tag. 2009-12-11 13:54:56 +00:00
1105917892 COLLADA branch: small code clean-ups in bone anim export. Correct bone anim export is to be done yet. 2009-12-11 13:06:18 +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
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
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
7b96bc00d5 Merge -c 24393 (patch by Jan) from COLLADA branch. 2009-11-07 14:34:04 +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