Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-30Cleanup: remove non-existing function declarationsCampbell Barton
2018-11-28Fix defined but unused static variable warningSergey Sharybin
2018-11-27fix: Collada: The limit precision option does nothingGaia Clary
2018-11-25Merge branch 'master' into blender2.8Campbell Barton
2018-11-23Partial rewrite of the Collada Module for Blender 2.8Gaia Clary
Most important changes are in the Animation exporter and Animation Importer. There is still some cleaning up to be done. But the Exporter/Importer basically work within Blender 2.8 Some details: User Interface: The interface has been reorganized to look more like the FBX interface. New options in user interface: * keep_keyframes: When sampling the distance between 2 keyframes is defined by the sampling rate. Furthermore the keyframes defined in the FCurves are not exported. However when this option is enabled then also the defined keyframes will be added to the exported fcurves * keep_smooth_curves: When sampling we do not use FCurves. So we also have no Curve handles for smooth exporting. However when this option is enabled, Blender does its best to recreate the handles for export. This is a very experimental feature and it is know to break when: - the exported animated objects have parent inverse matrices different from the unit matrix - The exported objects have negative scaling There may be many other situations when this feature breaks. This needs to be further tested. It may be removed later or replaced by something less wonky. BlenderContext: is a new class that contains the bridge to Blender. It contains pointers to the current export/import context plus derived values of Depsgraph, Scene, Main Reporting: I reorganized the output on the Blender Console to become more informative and more readable Preservation of Item names: name attributes are now encoded with XML entities. This makes sure that i can export/import names exactly defined in the tool. This affects material names, bone names and object names. Hierarchy export: * Object and Bone Hierarchies are now exported correctly by taking the Blender parent/child hierarchy into account * Export also not selected intermediate objects Problem: When we export an Object Hierarchy, then we must export all elements of the hierarchy to maintain the transforms. This is especially important when exporting animated objects, because the animation curves are exported as relative curves based on the parent-child hierarchy. If an intermediate animated object is missing then the exported animation breaks. Solution: If the "Selected" Optioon is enabled, then take care to also export all objects which are not selected and hidden, but which are parents of selected objects. Node Based Material Importer (wip): Added basic support for Materials with diffuse color and diffuse textures. More properties (opacity, emission) need changes in the used shader. Note: Materials are all constructed by using the principled BSDF shader. Animation Exporter: * Massive optimization of the Animation Bake tool (Animation Sampler). Instead of sampling each fcurve separately, i now sample all exported fcurves simultaneously. So i avoid many (many!) scene updates during animation export. * Add support for Continuous Acceleration (Fcurve handles) This allows us to create smoother FCurves during importing Collada Animation curves. Possibly this should become an option ionstead of a fixed import feature. * Add support for sampling curves (to bake animations) * The animation sampler now can be used for any animation curve. Before the sampler only looked at curves which are supported by Standard Collada 1.4. However the Collada exporter currently ignores all animation curves which are not covered by the 1.4.1 Collada Standards. There is still some room for improvements here (work in progres) Known issues: * Some exports do currently not work reliably, among those are the camera animations, material animations and light animations those animations will be added back next (work in progres) * Exporting animation curves with keyframes (and tangents) sometimes results in odd curves (when parent inverse matrix is involved) This needs to be checked in more depth (probably it can not be solved). * Export of "all animations in scene" is disabled because the Collada Importer can not handle this reliably at the moment (work in progres). * Support for Animation Clip export Added one extra level to the exported animations such that now all scene animations are enclosed: <Animation name="id_name(ob)_Action"> <Animation>...</Animation> ... </Animation> Animation Importer: * Import of animations for objects with multiple materials When importing multiple materials for one object, the imported material animation curves have all been assigned to the first material in the object. Error handling (wip): The Importer was a bit confused as it sometimes ignored fatal parsing errors and continued to import. I did my best to unconfuse it, but i believe that this needs to be tested more. Refactoring: update : move generation of effect id names into own function update : adjust importer/exporter for no longer supported HEMI lights cleanup: Removed no lopnger existing attribute from the exporter presets cleanup: Removed not needed Context attribute from DocumentExporter fix : Avoid duplicate deletion of temporary items cleanup: fixed indentation and white space issues update : Make BCAnimation class more self contained cleanup: Renamed classes, updated comments for better reading cleanup: Moved static class functions to collada_utils cleanup: Moved typedefs to more intuitive locations cleanup: indentation and class method declarations cleanup: Removed no longer needed methods update : Moved Classes into separate files cleanup: Added comments cleanup: take care of name conventions ... : many more small changes, not helpful to list them all
2018-09-02Cleanup: comment blocksCampbell Barton
2018-09-02Cleanup: comment blocksCampbell Barton
2018-06-24Nuke DM out of collada code.Bastien Montagne
Also, now use out-of-main temp copy of mesh for export, and fixed a potential memleak (return without freeing temp copy of mesh, tsst).
2018-06-14Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/collada/AnimationExporter.cpp source/blender/collada/AnimationExporter.h source/blender/collada/ArmatureImporter.cpp source/blender/collada/ArmatureImporter.h source/blender/collada/ControllerExporter.cpp source/blender/collada/ControllerExporter.h source/blender/collada/DocumentExporter.cpp source/blender/collada/DocumentImporter.cpp source/blender/collada/GeometryExporter.cpp source/blender/collada/GeometryExporter.h source/blender/collada/MeshImporter.cpp source/blender/collada/MeshImporter.h source/blender/collada/SkinInfo.cpp source/blender/collada/SkinInfo.h source/blender/collada/collada_utils.cpp source/blender/collada/collada_utils.h
2018-06-14Cleanup: remove last G.main's from Collada code.Bastien Montagne
2018-06-08Merge branch 'master' into blender2.8Campbell Barton
2018-06-08Cleanup: trailing spaceCampbell Barton
Remove from blender/nodes, collada, blenfont & render.
2018-04-16Depsgraph: remove EvaluationContext, pass Depsgraph instead.Brecht Van Lommel
The depsgraph was always created within a fixed evaluation context. Passing both risks the depsgraph and evaluation context not matching, and it complicates the Python API where we'd have to expose both which is not so easy to understand. This also removes the global evaluation context in main, which assumed there to be a single active scene and view layer. Differential Revision: https://developer.blender.org/D3152
2018-02-27Merge branch 'master' into blender2.8Sergey Sharybin
2018-02-27Collada: Use floating point version of abs()Sergey Sharybin
Avoids implicit cast of float to int.
2018-02-27merge from masterGaia Clary
2018-02-26Adding support for Matrix Transformation exportGaia Clary
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-25merged collada rework from master into blender 2.8Gaia Clary
2018-02-24T45687: Rework the Export/Import of AnimationsGaia Clary
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-17Merge branch 'master' into blender2.8Brecht Van Lommel
2018-02-16fix: limit precision also for animation matrixes if the limit option is set ↵Gaia Clary
(gives nicer output for inspection)
2018-02-16Fix rotation issues due to matrix to quaternion ambiguitiesGaia Clary
Reviewers: mont29 Reviewed By: mont29 Subscribers: mont29 Differential Revision: https://developer.blender.org/D3066
2018-01-26fix:T53271 now using the context scene layer as requestedGaia Clary
2018-01-01fix T53230: avoid Nullpointer problems in Collada ExporterGaia Clary
2017-08-16Pass EvaluationContext instead of bContextCampbell Barton
2.8x branch added bContext arg in many places, pass eval-context instead since its not simple to reason about what what nested functions do when they can access and change almost anything. Also use const to prevent unexpected modifications. This fixes crash loading files with shadows, since off-screen buffers use a NULL context for rendering.
2017-07-21Fix compilation error with Collada enabledSergey Sharybin
2017-06-24Collada: added new functions for improved material exporter (not used yet)Gaia Clary
2017-04-01fix: T50412 - collada: Replaced precision local limit function by blender's ↵Gaia Clary
own implementation
2017-03-23Collada - Added some helper functions into collada_utils, for common usage ↵Gaia Clary
in the collada module
2016-09-24Fix: Collada Importer did not import the Blender Profile information ↵Gaia Clary
correctly when multiple objects are bound to same armature. This caused Bone tails to be placed wrong.
2016-06-03changed use_connect from bool to a 3 state value (-1,0,1)Gaia Clary
2016-05-29added missing includeGaia Clary
2016-05-29Added support for non numeric bone layer labels (could happen when importing ↵Gaia Clary
from other tools) Differential Revision: https://developer.blender.org/D2037
2016-05-28Collada: Adding support for bone roll and bone layersGaia Clary
Differential Revision: https://developer.blender.org/D2034
2016-05-26moved is_leaf_bone() to collada utils for reuse in exporter and importerGaia Clary
2013-07-30Collada: Import now always rotates input to match blender's Z_UP axisGaia Clary
2013-03-03Collada: exported normals now based on MPoly instead of MFaceGaia Clary
2013-03-02Collada: Added support for ngon export/import and added triangulate option ↵Gaia Clary
to export
2013-02-11Fix #33437 Collada: Added scale matching for Scene imports.Gaia Clary
2013-02-09fixed: [#34080] import of COLLADA breaks on '#' in filepathGaia Clary
2012-11-01remove BLI_utildefines from BKE_DerivedMesh.h headerCampbell Barton
2012-08-12fixed: [#32240] Collada import when nodes share geometry but not materialGaia Clary
2012-06-22Collada: (Export) Added export of surface textures, and control over ↵Gaia Clary
exported uv layers
2012-06-17Collada: (Exporter) add 'mesh type selection(view|render)' for Apply ↵Gaia Clary
modifiers option
2012-06-16code cleanup: colladaCampbell Barton
- when bubble sorting names - dont convert to str::string just to compare strings - use BLI_linklist_index() to check if an item is in the list - quiet some warnings
2012-06-16Collada: (Exporter) Add new option 'deform bones only'Gaia Clary
2012-06-14Collada: Added export Option 'sort by object name' to fix an issue with ↵Gaia Clary
Second Life import
2012-06-13patch #31794 Collada: make exporter more robust, now uses ↵Gaia Clary
BKE_object_relational_superset()
2012-06-07[#31739] Collada: New Export selections 'Include Armatures'Gaia Clary
2012-05-04Fix #31258: collada now selects newly added objects after import.Brecht Van Lommel