griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
74,374 Commits 1 Branch 0 Tags
dfd8a52cd2e83b350e75cf69ee96d347e921ce26
Commit Graph

819 Commits

Author SHA1 Message Date
Antonio Vazquez
c3d7be150b Cleanup: iterator macros 
This line was missing in previous commit
 2018-03-09 11:00:54 +01:00
Campbell Barton
f47a41a3d9 Cleanup: iterator macros 
- put render iterator in own scope
  (would shadow it's own variable if used multiple times).
- enforce semicolon at end of iterator macros.
- no need to typedef one-off macro structs.
 2018-03-09 11:52:11 +11:00
Campbell Barton
f02af0407f Cleanup: use _BEGIN suffix for group iterators 2018-03-07 20:46:27 +11:00
Campbell Barton
7aed2de798 Cleanup: macro's w/ an _END need a matching _BEGIN 
Convention from 2.7x, since some looping macros don't need an '_END',
it avoids confusion to keep this.
 2018-03-01 19:01:53 +11:00
Gaia Clary
4a892adac5 merge from master (needed to fix collada headerfiles which have been modified in master and in blender2.8 slightly different) 2018-02-28 17:29:56 +01:00
Gaia Clary
e73fe77ac0 collada: EvaluationContext is now feeded into the class instances of AnimationExporter and DocumentExporter on creation. Also skipped the const qualifier for now because BKE_scene_graph_update_for_newframe() needs it to be not const 2018-02-28 17:10:57 +01:00
Gaia Clary
a363324f7f Collada: Make EvaluationContext const as its only used for reading here 2018-02-28 16:05:29 +01:00
Gaia Clary
91c3cfbb6f collada: call from operator to Collada exporter/importer now uses structures instead of passing many parameters 2018-02-28 16:05:29 +01:00
Gaia Clary
01f732d97b Collada: Moved structure definitions for export settings to the exportSettings.h Also make typedefs for import/export structures. 2018-02-28 16:05:28 +01:00
Gaia Clary
1a65168c42 merge Collada changtes from master 2018-02-27 17:53:53 +01:00
Gaia Clary
26fc197d49 Collada: commented out code was previously left over with an unresolved conflict in it. Deleting as its no longer needed 2018-02-27 17:14:35 +01:00
Gaia Clary
05b5958a7a Collada: Remove obsolete code 2018-02-27 17:08:40 +01:00
Gaia Clary
d1f0bdd337 fix: Collada Matrixdata Importer tried to fix rotations where nothing was to fix. The matrixdata import is now only doing a matrix decompose and then pplies the decomposed values to 3 trans-, 3 scale- and 4 rot-curves) 2018-02-27 17:02:52 +01:00
Gaia Clary
148e2ace61 Collada: removed unnecessary dup[licate matrix conversion in matrix data exporter 2018-02-27 17:02:52 +01:00
Sergey Sharybin
5a1a63a858 Merge branch 'master' into blender2.8 2018-02-27 11:16:43 +01:00
Sergey Sharybin
26f4ce4a76 Collada: Remove unused vector of flaot[4][4] values 
Was in fact causing issues on macOS, something to do with
a destructor.
 2018-02-27 11:14:55 +01:00
Sergey Sharybin
2026179bb2 Collada: Use floating point version of abs() 
Avoids implicit cast of float to int.
 2018-02-27 11:14:17 +01:00
Gaia Clary
e24906759f Merge branch 'master' into blender2.8 2018-02-26 23:38:21 +01:00
Gaia Clary
b5f0e8e1a1 Collada: removed unused variables. fixed incompatible format in console output (AnimationExporter.cpp) 2018-02-26 23:37:27 +01:00
Gaia Clary
f228a08d02 merge from master 2018-02-26 22:49:30 +01:00
Gaia Clary
7dd0e36dc4 simplified collada integration in Blender. made functions mostly similar with blender2.8 2018-02-26 17:18:31 +01:00
Gaia Clary
a024da55af Adding support for Matrix Transformation export 
The exporter does export matrix data (4*4 Transformation matrix) only for Skeletal animation. For object animation only exporting to trans/rot/loc is implemented.

This task implements Matrix export also for simple Object animation.

Differential Revision: https://developer.blender.org/D3082
 2018-02-26 17:16:56 +01:00
Gaia Clary
5f9657316e collada: fix typo in if statement 2018-02-26 12:55:54 +01:00
Campbell Barton
f1bd96a9ab Revert "changing collada parameters" 
This reverts commit d91f2ac37a.

This change makes scene.collada_export() meaningless
(ignoring the scene the method is being run on).
 2018-02-26 19:35:45 +11:00
Gaia Clary
2b158861a3 merged collada rework from master into blender 2.8 2018-02-25 00:06:41 +01:00
Gaia Clary
d91f2ac37a changing collada parameters 
Differential Revision: https://developer.blender.org/D3080
 2018-02-24 22:51:04 +01:00
Gaia Clary
dd7b9a362d T45687: Rework the Export/Import of Animations 
This started with a fix for an animated Object Hierarchy. Then i decided to cleanup and optimize a bit. But at the end this has become a more or less full rewrite of the Animation Exporter. All of this happened in a separate local branch and i have retained all my local commits to better see what i have done.

Brief description:

* I fixed a few issues with exporting keyframed animations of object hierarchies where the objects have parent inverse matrices which differ from the Identity matrix.
* I added the option to export sampled animations with a user defined sampling rate (new user interface option)
* I briefly tested Object Animations and Rig Animations.

What is still needed:

* Cleanup the code
* Optimize the user interface
* Do the Documentation

Reviewers: mont29

Reviewed By: mont29

Differential Revision: https://developer.blender.org/D3070
 2018-02-24 15:55:27 +01:00
Brecht Van Lommel
f2453ecdcd Merge branch 'master' into blender2.8 2018-02-17 01:39:29 +01:00
Gaia Clary
5bc2c17161 fix:T50079 collada matrix and blender matrix are transposed. This was not regarded by the animation importer, so it was creating very odd results 2018-02-16 16:58:20 +01:00
Gaia Clary
e1a686e444 fix: limit precision also for animation matrixes if the limit option is set (gives nicer output for inspection) 2018-02-16 16:55:20 +01:00
Gaia Clary
7fdf720fb1 Fix rotation issues due to matrix to quaternion ambiguities 
Reviewers: mont29

Reviewed By: mont29

Subscribers: mont29

Differential Revision: https://developer.blender.org/D3066
 2018-02-16 15:19:35 +01:00
Campbell Barton
37e53ca5f3 Missed opencollada edit in recent changes 2018-02-09 20:25:32 +11:00
Bastien Montagne
98dcd33238 Fix Collada building after changes in API. 
Seriously guys... *Full* build when you change APIs!
 2018-02-06 12:11:00 +01:00
Gaia Clary
dcea87b58e fix: rBc4a19e988bb4 error stepped in by a merge from mmaster 2018-02-02 17:30:54 +01:00
Sergey Sharybin
26dff781b3 Merge branch 'master' into blender2.8 2018-02-02 12:21:24 +01:00
Gaia Clary
c4a19e988b fix: silence warnings about unused local variable (thanks to dfelinto for the hint) 2018-02-02 11:57:10 +01:00
Campbell Barton
c3eb22e2ab Merge branch 'master' into blender2.8 2018-02-02 14:15:29 +11:00
Gaia Clary
78a77fe622 fix: unintentionally commented out collada animation export 2018-02-02 00:49:42 +01:00
Gaia Clary
4bd72586aa Merge branch 'master' into blender2.8 
Apply Fix T50198 also in blender2.8
 2018-02-01 00:43:01 +01:00
Gaia Clary
22faf66c8b fix T50198: The OpenCollada error handler must return true after detecting uncritical errors. 2018-02-01 00:41:39 +01:00
Gaia Clary
376fc19b24 fix:T53271 now using the context scene layer as requested 2018-01-26 13:37:45 +01:00
Dalai Felinto
ab77363619 Fix silly crash on Collada 
Note: This was originally wrongly committed together with an outliner tooltip
fix, re-committing separately now. See bd7060a87f.
 2018-01-26 08:45:27 -02:00
Dalai Felinto
13238ee991 Revert "Fix crash on Collada exporter" 
This reverts commit bd7060a87f.

I mixed two commits together (a fixup for outliner tooltips and a collada fix).
Re-committing them individually.
 2018-01-26 08:43:17 -02:00
Dalai Felinto
bd7060a87f Fix crash on Collada exporter 2018-01-26 08:38:46 -02:00
Campbell Barton
873a87c7e8 Merge branch 'master' into blender2.8 2018-01-16 14:56:03 +11:00
Campbell Barton
e428ea3e00 Cleanup: indentation 2018-01-16 11:40:43 +11:00
Gaia Clary
e59cf13b8c fix T53230: avoid Nullpointer problems in Collada Exporter 2018-01-01 15:02:26 +01:00
Bastien Montagne
c027be3189 Fix broken collada from recent merge rBb83b6afe5572ae29b4ad105dd8001c3343e2205b. 
Please make minimal checks on what you do when merging!
 2017-12-14 20:25:26 +01:00
Campbell Barton
b83b6afe55 Merge branch 'master' into blender2.8 2017-12-14 12:51:26 +11:00
Campbell Barton
1f95347882 Fix T53322: Collada export crash w/ shape keys 
D2958 by @cmbasnett
 2017-12-14 10:59:41 +11:00