Commit Graph

287 Commits

Author SHA1 Message Date
Campbell Barton 274b9c8fb8 whitespace cleanup 2011-09-25 12:31:21 +00:00
Campbell Barton a20bcb4613 clear up some warnings. 2011-09-22 14:42:29 +00:00
Campbell Barton 13dfd82997 changes for materials to treat them as shorts not int/chars (since they are stored as shorts intermally)
- converting nurbs to mesh was casting the material to unsigned char.
- subsurf was casting to char, then int -> short in a loop.
- have material functions take & return shorts.
2011-09-20 06:25:15 +00:00
Campbell Barton d4898f9c40 use macros RAD2DEG & DEG2RAD rather then multiplying by 180.0/M_PI or M_PI/180.0 2011-09-17 09:43:51 +00:00
Campbell Barton 97c78e25f0 fix for opencollada crash with r40164, missing NULL check. 2011-09-12 13:59:23 +00:00
Nathan Letwory 1dcf9c636c Fix [#28614] Collada Exporter does not export Ambient term
reported by Steiner Bernhard

ma->ambX is calculated only on a render, so instead of relying on those values compute them manually.
2011-09-12 13:20:24 +00:00
Nathan Letwory 4a9a0ec3e4 Code shuffle so function has only one exit point. 2011-09-12 10:57:41 +00:00
Campbell Barton 357febc168 fix for building with collada and some other warnings 2011-09-10 09:38:38 +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 5fa7452559 Attempt to fix compile error on OSX 2011-09-07 07:02:56 +00:00
Nathan Letwory 9baff83d72 Split off scene export code. 2011-09-06 22:18:12 +00:00
Nathan Letwory 6e9ff495eb Add parser error handler.
OpenCOLLADA is a validating parser, so is pretty strict about document form. The added error handler will print out any errors the parser finds. A pop-up will be shown too, advising the user to check the console for the error log.
2011-09-05 20:41:58 +00:00
Brecht Van Lommel a6d9a5a972 Code cleanup: warning fixes. 2011-09-05 19:27:21 +00:00
Nathan Letwory cc1c8268f7 Left debug print accidently enabled. 2011-09-05 15:03:31 +00:00
Nathan Letwory 5c5b9cf4d7 Remove NULL-checks, as they might cause infinite loops while reading a DAE containing unsupported data, i.e. <lines> geometry. 2011-09-04 22:14:28 +00:00
Nathan Letwory 1cada203bc [#27884] Collada import: materials mismatch when 2 instance_geometry reference the same material
Reported by David Roy

Multi-materials used on different meshes would get ignored (resulting in white faces in textured view).
2011-09-04 14:31:23 +00:00
Nathan Letwory caa1acb6b1 Prevent potential crasher, commonEffects could be empty. 2011-09-04 02:12:03 +00:00
Nathan Letwory cbc812b757 Fix [#28322] COLLADA imports messed up UVs
Reported by Chad Gleason

Imported index order could put mface->v4==0. We already know amount of verts, so use that instead.
2011-09-04 01:13:44 +00:00
Nathan Letwory 1764f2135d Some whitespace changes 2011-09-04 00:15:59 +00:00
Campbell Barton 451136e7c0 warning fixes 2011-09-03 15:36:36 +00:00
Nathan Letwory d0d82c69e9 COLLADA: Take parent bone length and direction instead of using bone pointing up with length 1. Looks much nicer and less confusing on larger armatures now. 2011-08-31 09:37:14 +00:00
gsr b3d 5ac81bfe9c SVN maintenance. 2011-08-30 19:38:32 +00:00
Nathan Letwory c6f994062e Check for potential crasher.
Reported and suggested in [#27687] by Dean Giberson. Couldn't redo crash myself, but better safe than sorry :)
2011-08-30 15:43:00 +00:00
Joerg Mueller 9424b1ceff Merging pepper to trunk at revision 39791.
Important note: I used rsync to do the local merge, as "svn merge --reintegrate ^/branches/soc-2011-pepper" doesn't work with our svn server right now!
2011-08-30 09:15:55 +00:00
Joerg Mueller 43ab8e8624 * Merge trunk up to r39790.
* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.
2011-08-30 08:22:03 +00:00
Sukhitha Jayathilake ca79dee61f armature object animation bug fix. 2011-08-28 18:30:18 +00:00
Sukhitha Jayathilake cdbb904b32 code review fixes 2011-08-26 15:16:27 +00:00
Campbell Barton 9ad6434c4e opencollada find module. hopefully solves the problem where includes can in an /include subdir or not. 2011-08-24 16:04:35 +00:00
Thomas Dinges ed3d253c56 Fix for [#28339] Rev:39618 The revision part doesn't suffice.
NAN_BUILDINFO > WITH_BUILDINFO change from rev 39618 was missing in those files.
2011-08-23 08:02:48 +00:00
Joerg Mueller f0d5abfcb2 Merging trunk up to r39637. 2011-08-22 20:31:46 +00:00
Campbell Barton 7d316b70b8 rename NAN_BUILDINFO --> WITH_BUILDINFO 2011-08-22 16:54:26 +00:00
Sukhitha Jayathilake 6b99cd05aa Armature object animations export. 2011-08-21 15:47:21 +00:00
Sukhitha Jayathilake 4f75566672 export animations if a bone is in a deform group. ( on hold ) 2011-08-21 13:51:04 +00:00
Sukhitha Jayathilake bcadb6b939 small fixes and refactoring. 2011-08-20 16:48:53 +00:00
Sukhitha Jayathilake ac3d785caa Animation exporter matrix source param fix. 2011-08-19 14:29:33 +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
Sukhitha Jayathilake 2ee74be88c Blender tip profile for bones with 2 or more children. 2011-08-18 19:16:36 +00:00
Nathan Letwory 475e0b8c02 Apply [#28287] COLLADA fix for inverse bind matrix of skin controller
Patch by Pelle Johnsen
2011-08-18 09:14:27 +00:00
Sukhitha Jayathilake a46f36c9b6 Animation export id bone animation + armature importer cleanup. 2011-08-17 20:15:40 +00:00
Sukhitha Jayathilake e86e922f5b Armature importer code cleanup. 2011-08-17 18:29:01 +00:00
Sukhitha Jayathilake f3c05e8eb2 armature animation export fix. 2011-08-17 18:28:01 +00:00
Sukhitha Jayathilake d79967e164 Animation Exporter clean up. 2011-08-16 17:17:13 +00:00
Sukhitha Jayathilake f04fb5b6ea Finalizing. 2011-08-16 16:03:37 +00:00
Sukhitha Jayathilake cc3b9aa467 blender extra parameter animation import ( on hold ); 2011-08-14 16:15:41 +00:00
Sukhitha Jayathilake e93444f816 Matrix transformation animation import for other objects under the new system. 2011-08-14 16:14:32 +00:00
Sukhitha Jayathilake fc0a5ede01 Cleanup 2011-08-14 16:13:35 +00:00
Sukhitha Jayathilake c86bcd5065 transform matrix animation import fix. 2011-08-13 16:22:14 +00:00
Sukhitha Jayathilake a4b6cfd872 light parameter export expansion. 2011-08-13 16:21:41 +00:00
Sukhitha Jayathilake c106f7bee9 Light blender profile param sid addressing 2011-08-13 16:20:28 +00:00
Sukhitha Jayathilake 83f0c6e569 Transform matrix Animation import fix. 2011-08-12 20:38:29 +00:00