Commit Graph

66 Commits

Author SHA1 Message Date
4a04f72069 remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
Nathan Letwory
3dc0ee19c4 Introduce struct for export settings in COLLADA export code. This will make it easier to
add new options without having to change function signatures all over the place.
2011-09-07 18:23:30 +00:00
Nathan Letwory
9baff83d72 Split off scene export code. 2011-09-06 22:18:12 +00:00
451136e7c0 warning fixes 2011-09-03 15:36:36 +00:00
f0d5abfcb2 Merging trunk up to r39637. 2011-08-22 20:31:46 +00:00
7d316b70b8 rename NAN_BUILDINFO --> WITH_BUILDINFO 2011-08-22 16:54:26 +00:00
Nathan Letwory
c646519776 Export only objects on visible layers. This ensures we can hide for instance bone shapes. 2011-08-18 22:56:41 +00:00
3f3c6f5f1f Merging from trunk up to r38119. 2011-07-05 13:54:25 +00:00
Nathan Letwory
cf43e48fc7 Apply patch 4636051. COLLADA: Export selection.
Original patch by Jan Diederich, adapted by Pelle Johnsen. Review assistance by Daniel Tavares.

This patch adds an option to export only the selection.
2011-07-04 08:59:28 +00:00
93e992c5d9 AnimationExporter class refactoring.
Exported AnimationExporter class to a separate set of files.
2011-05-26 17:07:38 +00:00
433cc15527 Code Cleanup in DocumentExporter.cpp. (Test Commit) 2011-05-25 17:14:31 +00:00
Nathan Letwory
7e53769d09 COLLADA conformance: don't write empty libraries for effect, image and animation 2011-03-18 14:06:13 +00:00
Nathan Letwory
a84e43c48b COLLADA: Don't write empty libraries for geometry, lights, cameras, controllers 2011-03-17 16:40:53 +00:00
Nathan Letwory
caf9fb6cce doxygen: blender/collada tagged. 2011-02-27 20:30:35 +00:00
Nathan Letwory
5b607701a7 doxygen: prevent GPL license block from being parsed as doxygen comment. 2011-02-23 10:52:22 +00:00
Nathan Letwory
71cb745941 Commit to cope with API changes in OpenCOLLADA (latest for Windows right now r827). 2011-01-27 19:39:06 +00:00
dba1904f65 bugfix [#24518] Blender wont compile with -Wall -Werror and COLLADA support
fix included in report from Martijn Berger (mberger)
made some small changes.

- use ints rather then unsigned long for printing, values are not likely to be very large.
- CMake remove strict flags from collada build dir since I had warnings in the collada headers.
- added xml2 to collada libraries else I couldnt get collada building.
2010-11-03 22:44:39 +00:00
Nathan Letwory
8ec87bb45f COLLADA
Export unit system and scale instead of hard-coded 1 decimeter.
2010-10-11 12:38:52 +00:00
Nathan Letwory
c139faf171 COLLADA: Split EffectsExporter into separate files. 2010-10-07 00:24:42 +00:00
Nathan Letwory
c0b36a0be0 COLLADA: Split ImagesExporter into separate files. 2010-10-06 16:23:52 +00:00
Nathan Letwory
ca44eb3abd GCC fixes for r32346 2010-10-06 13:55:50 +00:00
Nathan Letwory
0d815d3528 COLLADA: Split MaterialsExporter into separate files. 2010-10-06 13:21:08 +00:00
Nathan Letwory
e161c22dc2 Assorted GCC fixes for OpenCOLLADA support 2010-10-06 12:04:56 +00:00
Nathan Letwory
7245280f6c COLLADA: Split ArmatureExporter, InstanceWriter and TransformWriter into separate files. 2010-10-06 11:02:44 +00:00
Nathan Letwory
c88a46e585 COLLADACOLLADA exporter: split geometry export into own files. 2010-10-06 09:53:06 +00:00
Nathan Letwory
fdadab1006 COLLADA exporter: split camera and light export into own files. 2010-10-06 07:13:42 +00:00
Nathan Letwory
82209cdc86 Reorganisation of COLLADA import code. Classes have been split into their own files.
No functional changes.

Where necessary extern "C" {} blocks have been added.
2010-10-05 00:05:14 +00:00
c0a7b5c2a8 COLLADA exporter fix: do not create a duplicate <polylist> if an object has NULL materials linked along with normal materials. 2010-10-04 03:38:37 +00:00
Nathan Letwory
27fa0dfc70 Patch [#23589] Use Author field from User Preferences for COLLADA export.
Submitted by Imran Syed.

When U.author is set, it'll be used instead of default "Blender User".
2010-10-02 09:42:35 +00:00
Nathan Letwory
e8465555cb Prevent crash if image for image texture is not set, part II. 2010-09-30 11:49:48 +00:00
Nathan Letwory
0d1a9c7784 Prevent crash if image for image texture is not set. 2010-09-30 11:42:02 +00:00
Nathan Letwory
8a68326f81 COLLADA: Better import and export of cameras. 2010-09-28 08:01:20 +00:00
396aece473 Partial fix of bug #23543 in COLLADA exporter:
* multiply the diffuse and specular colors by their respective intensities
* only output <transparency> if MA_TRANSP flag is on
* only output <reflective> and <reflectivity> if MA_RAYMIRROR flag is on
2010-09-12 20:19:15 +00:00
5416fee99a Bug #23715: patch by Jan Diederich to avoid having duplicate IDs after they are translated.
For example, object ID names "1a", "2a", "3a", will be exported as "_a", "_a2", "_a3". Thanks Jan!
2010-09-10 15:24:10 +00:00
7abf2faa20 Bug #23715 in COLLADA exporter: prepend an '_' to the ID if it starts with an illegal character.
Pointed out by Tom Haines. Thanks!
2010-09-09 11:01:30 +00:00
ad48fd1db9 Patch by Jan Diederich, fixes bug #23715 in the COLLADA exporter.
Allow IDs to start only with an alphabetic character replacing digits with an '_'.
2010-09-09 08:14:36 +00:00
Nathan Letwory
92422ba452 Patch [#23389] Add authorship information to exported COLLADA files
Contributed by Imran Syed (freakabcd).

This adds basic authoring tool and author info ("Blender User" for now).

NOTE: Linux and OSX users need now to update their OpenCOLLADA libs - Blender should now compile fine with their latest revision.

Made some changes to the original patch to ensure linking is done correctly.
Some small cleanups for scons too.
2010-08-26 06:58:32 +00:00
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