87b2444270
Merge branch 'master' into blender2.8
...
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-14 15:55:51 +02:00
fd19069999
Cleanup: remove last G.main's from Collada code.
2018-06-14 15:15:51 +02:00
908b6960c0
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
a25c11fd8d
Cleanup: trailing space
...
Remove from blender/nodes, collada, blenfont & render.
2018-06-08 08:07:48 +02:00
34ab90f546
Depsgraph: remove EvaluationContext, pass Depsgraph instead.
...
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-04-16 19:55:33 +02:00
1b462e5a51
Pass EvaluationContext instead of bContext
...
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-08-16 12:46:04 +10:00
ac0da72a60
Fix compilation error with Collada enabled
2017-07-21 17:44:11 +02:00
bdacb60a92
Collada: Fix: Geometry exporter did not create all polylist when meshes are only partially textured
2017-06-24 23:33:34 +02:00
0d2b1da3a6
Collada: added new functions for improved material exporter (not used yet)
2017-06-24 22:16:47 +02:00
bbae0664a3
Added Support for Custom Vertex Normals to Collada exporter
2015-04-16 19:02:26 +02:00
8bdac4d0bc
fix T39967: Added support for Import/export of vertex color layers
2014-05-01 14:52:36 +02:00
fe81ac0e4e
Fix T37753: encapsulated the creation of the source ID into one function to ensure the id is always created correctly
2013-12-09 23:18:01 +01:00
c36f20a7d2
style cleanup
2013-03-08 04:00:06 +00:00
4774357b59
Collada: exported normals now based on MPoly instead of MFace
2013-03-03 13:53:32 +00:00
be701b6278
Collada: Added support for ngon export/import and added triangulate option to export
2013-03-02 15:58:13 +00:00
debc3ac910
Collada export: Add ngon support (initial)
2013-02-27 13:53:43 +00:00
c263753d17
Added gsoc-2012 collada improvements from bratwurst branch
2013-01-21 13:45:49 +00:00
9f22750422
style cleanup
2012-07-04 20:47:12 +00:00
36ed4818e5
patch #31794 Collada: make exporter more robust, now uses BKE_object_relational_superset()
2012-06-12 21:25:29 +00:00
49a5141cde
[ #31739 ] Collada: New Export selections 'Include Armatures'
2012-06-07 17:55:26 +00:00
2c05190374
fix [ #31320 ] Collada now supports import/export of loose edges (edges not attached to faces)
2012-05-16 11:21:03 +00:00
98ba7dfecf
Collada: patch #31331 : Implementation of 'Apply Modifiers'
2012-05-07 18:09:59 +00:00
3553bf6db0
fix for incorrect selection check in opencollada integration.
2012-04-28 07:02:44 +00:00
b340f930ec
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
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
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
c646519776
Export only objects on visible layers. This ensures we can hide for instance bone shapes.
2011-08-18 22:56:41 +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
Nathan Letwory
bcec824299
doxygen: COLLADA entry
2011-02-21 08:38:53 +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
e2b3ff5024
Apply patch [ #24722 ] COLLADA exporter: handle instancing
...
Submitted by Wenzel Jakob
Patch adds handling of linked meshes: instead of generating separate geometry objects, use instances.
2010-11-16 22:27:31 +00:00
47969866e0
SVN maintenance.
2010-10-06 20:40:16 +00:00
Nathan Letwory
c88a46e585
COLLADACOLLADA exporter: split geometry export into own files.
2010-10-06 09:53:06 +00:00
