Commit Graph

153 Commits

Author SHA1 Message Date
Campbell Barton
09da9d4393 cmake maintenance
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
2011-05-31 01:15:44 +00:00
Campbell Barton
70d059161b workaround/fix [#27162] Running commands in python console crashes blender 2011-04-25 12:39:53 +00:00
Nathan Letwory
2b79378f81 COLLADA lights:
* simplify export and import, now that we have blender profiles for lights. The vanilla import is now more in line with the specs. If a blender profile is found, skip normal import, use the profile data instead.
* multiply energy into color rgb export (common profile).
* recalc distance taking metrics in account
2011-03-30 10:51:01 +00:00
Guillermo S. Romero
5f5ec9ec3c SVN maintenance. 2011-03-28 21:30:41 +00:00
Nathan Letwory
fee4cc34cc Add missing header for *nix machines. 2011-03-28 11:04:38 +00:00
Nathan Letwory
bd9854e7d1 Import light blender profile if it exists. 2011-03-28 09:31:44 +00:00
Nathan Letwory
45f9dd4bd9 COLLADA lamp blender profile: add the remainder of the lamp variables to export. 2011-03-27 17:57:14 +00:00
Nathan Letwory
3cb6f52eec Add blender light profile. 2011-03-27 09:46:20 +00:00
Guillermo S. Romero
4b5819a5af SVN maintenance. 2011-03-26 23:55:54 +00:00
Damien Plisson
ac2d935a32 Update cmake & scons scripts to use new Collada includes for building with latest blender collada updates 2011-03-26 09:09:00 +00:00
Nathan Letwory
32abf5eca8 Add ExtraTags class for handling tags inside an extra block. 2011-03-25 11:07:57 +00:00
Nathan Letwory
c5c4b31d6b Mostly formatting commit, small elaboration in extra handling API (take pointer to importer). 2011-03-25 09:52:36 +00:00
Campbell Barton
66670b8f7f fix for building collada on linux 2011-03-23 15:07:30 +00:00
Nathan Letwory
3c45a2d298 COLLADA: supporting barebone class for <extra> support (incomplete). 2011-03-23 14:25:35 +00:00
Nathan Letwory
82f99a0db0 Adding header for offsetof() 2011-03-23 09:18:09 +00:00
Nathan Letwory
4470783264 Fix [#26474] double_sided wrong in COLLADA Export
reported by Juan Linietsky

The export was not really wrong, but Maya expects their profile to be present inside <geometry>. Added this for mesh with ME_TWOSIDED flag set.

Ideally this will change in the future to be controllable through options to the exporter (like current Google Earth and 3DS Max extensions for <double_sided>).
2011-03-23 00:19:38 +00:00
Nathan Letwory
ee99cf5aa5 Wrong extension tag: show_double_sided -> double_sided 2011-03-23 00:03:52 +00:00
Nathan Letwory
de89e78589 Fix [#26475] <instance_material> wrong in COLLADA export.
reported by Juan Linietsky
fix by Imran Syed (freakabcd)

Use material index suffixed to material name to create symbolic name.
2011-03-22 22:51:02 +00:00
Nathan Letwory
60b94886c8 Small tweak to material export: only export as <lambert> when spec intensity is 0.0 and diffuse shader is set to Lambert. Other cases will be handled in due time, until then phong. 2011-03-22 22:00:26 +00:00
Nathan Letwory
f78e11dc38 [#26476] <specular> and <shininess> missing from Colada
reported by Juan Linietsky

Export <specular> for <phong> and <blinn> shaders, <shininess> was already being written for these.
<lambert> shader doesn't have <shininess>.

Right now we write <phong> when blender spec is phong, <blinn> when blender spec is blinn. When spec is
any other shader, and diffuse shader set to lambert, we export as <lambert>. Any other combination defaults
right now to <phong>. This will change when Blender specific profiles have been created for the shader
combinations in Blender.
2011-03-22 15:28:56 +00:00
Nathan Letwory
e1a44e9ae6 COLLADA: small tweaks to directional light import. 2011-03-21 09:50:30 +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
3e8c838a99 Fix [#26012] Import Collada: instance_node incorrectly handled
Reported by David Roy

When <instance_node>s where read, their transformation matrix got overwritten with the transform matrix
of their own node, not taking into account the parent node transformation. Instead of doing
that we now get the parent node transformation matrix and apply it to its own, and prevent
caller from overwriting this new transformation matrix.
2011-03-09 14:16:21 +00:00
Nathan Letwory
3f9bbde4a6 Fix [#26037] Import Collada crashes Blender
Submitted by David Roy

Multiple nodes can reference the same geometry, and specify the same materials. This lead
to the import code overwriting material mappings of faces in a destructive way. Instead of
just writing the material bindings always we now keep book of what geometry+material mapping
we've already handled.
2011-03-09 01:13:28 +00:00
Nathan Letwory
94b5fd6eb9 Skip materials that are invalid. 2011-03-08 20:41:43 +00:00
Nathan Letwory
3d05311d3c Apply [#26383] Triangle fans support for COLLADA importer
Submitted by Alexey Zakharov

This patch adds support to Blender for reading geometry data that's
represented as triangle fans.
2011-03-08 13:26:41 +00:00
Nathan Letwory
82b21ba166 Fix [#26213] Collada exporter id's not unique
Reported by Kevin Yoon

<material> could get same id as <node>, prevent that by suffixing -material.
2011-02-28 14:24:52 +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
322ff7dfe4 I swear, it was just an innocence change in guardedalloc!
The butterfly wing flap, causing a nice storm in the rest of blender.

Now all dependencies should point ok again. CMakers, do double-test.
2011-02-21 12:35:04 +00:00
Nathan Letwory
bcec824299 doxygen: COLLADA entry 2011-02-21 08:38:53 +00:00
Campbell Barton
f77051c2fc fix for build warning with openCOLLADA svn833 reported by Dave Plater.
Also fixed duplicate header define between 2 includes.
2011-02-17 22:57:56 +00:00
Campbell Barton
867fc4b463 enforce string limits (reported by pedantic checking tools & some developers).
mostly replace strcpy with BLI_strncpy and multiple strcat's with a BLI_snprintf().
also fix possible crash if CWD isnt available.
2011-02-13 03:21:27 +00:00
Campbell Barton
0a4eb24ca0 fix for building with opencollada 833 on linux. 2011-02-12 06:25:04 +00:00
Nathan Letwory
f3a19f4324 small typo fix 2011-02-04 13:18:44 +00:00
Campbell Barton
89c617a116 remove nan-makefiles 2011-01-30 15:29:22 +00:00
Nathan Letwory
7769c00385 First step towards having a 2-pass reading of COLLADA .dae files. 2011-01-28 12:56:30 +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
Nathan Letwory
dbb67b4d4c Fix [#25575] Collada import problem with Maya2010 exported collada files
Reported by Morten Mikkelsen

It seems that the maya export may generate invalid joint UIDs. Skip these joints to prevent crash.
2011-01-10 23:31:14 +00:00
Campbell Barton
8f21a43535 split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h.
no functional changes.
2011-01-07 18:36:47 +00:00
Campbell Barton
5e382eb8e5 rename blenderlib to blender_add_lib 2010-12-22 23:09:30 +00:00
Nathan Letwory
c5077e1ede Fix [#24359] Collada: end bone zero size, mysterious extra empty
Reported by Thomas Larsson
Fix by Jeroen Bakker

Fix max length of leaf bone and remove empty.
2010-12-21 10:43:47 +00:00
Nathan Letwory
044e31b89c Fix [#25319] COLLADA import segfaults on maya model
Reported by Michael Williamson
Fixed by Jeroen Bakker

Wrong UV index was being used.
2010-12-21 09:41:02 +00:00
Nathan Letwory
17f37dcecc Apply [#25297] Fix for [#23765]
Bug reported by alarionfirn
Patch submitted by Jeroen Bakker

It took the read the N+N of the uv-layer, it should be the Nth uv layer.
2010-12-19 20:40:52 +00:00
Campbell Barton
f90a2123ee no functional change: only check against OB_RECALC_ALL but don't use for assignment.
Makes adding new flags give ambiguous results and also makes it less easy to tell whats intended.
In some places it looks like OB_RECALC_TIME should be left out too.
2010-12-17 15:51:42 +00:00
Nathan Letwory
100d611ce5 Apply patch [#25224] Refactor COLLADA DocumentImporter
Submitted by Martijn Berger.

Make DocumentImporter class the actual IWriter implementation and move prototype to the header.
Group together functions that we should move out of the class.

No functional changes.
2010-12-14 21:46:03 +00:00
Campbell Barton
afacd18498 use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed. 2010-12-08 08:43:06 +00:00
Brecht Van Lommel
b110c7c8f2 Dependency graph: changed DAG_id_flush_update to DAG_id_tag_update. Now it
only tags the ID and does the actual flush/update delayed, before the next
redraw. For objects the update was already delayed, just flushing wasn't
yet.

This should help performance in python and animation editors, by making 
calls to RNA property update quicker. Still need to add calls in a few
places where this was previously avoided due to bad performance.
2010-12-05 18:59:23 +00:00
Campbell Barton
e8397e6193 include headers in cmake source, added a script to check for consistency, reporting missing headers & C files.
this is important so IDE's using CMake integration always get blender headers. - QtCreator & MSVC for eg, probably others too.
2010-11-29 04:35:56 +00:00