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
75fc1c3507
Cleanup: trailing whitespace (comment blocks)
...
Strip unindented comment blocks - mainly headers to avoid conflicts.
2018-06-01 18:19:39 +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
85de548e03
Cleanup: indentation
2018-04-16 17:08:27 +02:00
2c9c22df26
fix Collada: wrong usage of pointer and hidden redeclaration
...
* Suspicious usage of pointer:
short *type = 0; // this creates a null pointer
When this is later used for anything then blender would crash.
After following the code and check what happens i strongly believe
the author wanted to use a short and not a pointer to a short here.
* local variable where reused later in same function
While this did no harm, i still felt it was better to use a different
name here to make things more separated:
- moved variable declaraiotns into loop (for int a=0; ...)
- renamed uv_images to uv_image_set
- renamed index variable from i to j in inner loop that
reused same index name from outer loop
2018-03-11 20:59:50 +01:00
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
b83b6afe55
Merge branch 'master' into blender2.8
2017-12-14 12:51:26 +11:00
1f95347882
Fix T53322: Collada export crash w/ shape keys
...
D2958 by @cmbasnett
2017-12-14 10:59:41 +11:00
e3fe8128e4
Merge branch 'master' into blender2.8
2017-09-29 19:55:00 +10:00
9cba119051
Collada: export vertex-color alpha
2017-09-29 18:12:14 +10:00
772944a6b4
Merge branch 'master' into blender2.8
2017-09-27 00:24:10 +10:00
870dfb1b5a
Cleanup: indentation
2017-09-27 00:17:28 +10: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
1c053c6a12
Collada: Exporter now only exports either 'Materials' or 'UV Textures as Materials'. This makes the user interface more streight
2017-06-25 22:06:42 +02:00
c9b95c28f6
fix: T51622 The exporter now exports meshes as <Triangles> when all contained polygons are tris
2017-06-25 14:51:51 +02:00
fcb8761966
fix: Collada fprintf needs std::string be converted to char *
2017-06-25 13:18:21 +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
ddabe465b5
collada: export UV Textures as materials. Note: the reimport of the exported collada files will have materials assigned instead of UV Face Textures! This is expected behavior
2017-06-24 22:16:47 +02:00
0d2b1da3a6
Collada: added new functions for improved material exporter (not used yet)
2017-06-24 22:16:47 +02:00
a5a1d4aa3a
fix T44884: corrected a wrong usage of the CustomLayer API (due to a misunderstanding)
2015-05-30 14:19:01 +02:00
51bec8e22e
fix T44884: Index counter for active UV Map used wrong offset
2015-05-29 16:20:33 +02:00
1bf685488c
Collada Exporter: sanitize a bit lnor export.
...
In case `BKE_mesh_calc_normals_split()` would fail, exporter would read
uninitialized random mem... Should not happen, but better be safe than sorry.
2015-05-11 17:22:18 +02:00
51f33a2e55
collada:custom normals generated by normals modifier have not been exported correctly. Also triangulating during export did not work.
2015-05-06 17:03:38 +02:00
bbae0664a3
Added Support for Custom Vertex Normals to Collada exporter
2015-04-16 19:02:26 +02:00
d526ef607d
Cleanup: rename BKE_key_convert/update to BKE_keyblock_convert/update.
...
We are handling a keyblock here, not a whole key(set). Names are alreay a bit confusing,
let's be consistent at least.
2014-11-17 11:19:54 +01:00
ea6fba2926
Cleanup: Remove unused variables.
2014-05-01 16:32:25 +02:00
8bdac4d0bc
fix T39967: Added support for Import/export of vertex color layers
2014-05-01 14:52:36 +02:00
e79b244097
Fix collada and freestyle module compile errors after recent commit, forgot to
...
compile with those enabled.
2014-01-15 19:15:51 +01: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
9acadd17a9
fix [ #35592 ] Collada (DAE) exporter messes up vertex colors
2013-06-02 23:53:03 +00:00
631f2b94ef
fix:#35073 face normals calculation used wrong mloop index
2013-04-25 13:28:32 +00:00
655ed9cc7f
style cleanup
2013-03-18 11:44:56 +00:00
86ff11fe47
Collada: Added ngon support to Vertex Color exporter
2013-03-04 13:12:56 +00:00
2921d48239
code cleanup: unused vars in collada, preprocessor formatting & warning in mingw.
...
also compiling without bullet needed a stub added.
2013-03-04 00:53:57 +00:00
f19206a361
Collada: Fix export of Normals where shading is set to smooth
2013-03-04 00:17:20 +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
8996184ac4
Fixed importing of shapekey names: name is now taken from geometry name instead of deriving it from the mesh name
2013-02-12 17:52:18 +00:00
942ad6d9cd
style cleanup
2013-02-10 17:06:05 +00:00
69993c5d40
style cleanup: spaces -> tabs
2013-02-04 00:18:09 +00:00
c263753d17
Added gsoc-2012 collada improvements from bratwurst branch
2013-01-21 13:45:49 +00:00
a0f01ef8d8
remove BLI_utildefines from BKE_DerivedMesh.h header
2012-11-01 15:34:38 +00:00
f3ece5a108
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
2012-10-21 05:46:41 +00:00
d8144ef0f5
style cleanup: comment blocks
2012-10-04 13:26:15 +00:00
0a0074f9c6
Collada: do not call polylist export for objects with no polygons (avoid a missleading warning message)
2012-09-12 18:26:01 +00:00
