66738d4aa0
Merge branch 'master' into blender2.8
2018-10-11 09:08:30 +11:00
2083a7e274
Cleanup: style (pointers)
2018-10-11 09:03:39 +11:00
0ddf3e110e
Cleanup: comment blocks
2018-09-02 18:51:31 +10:00
ae57383648
Cleanup: comment blocks
2018-09-02 18:28:27 +10:00
31d916210c
Cleanup: remove DM from 'join as shape' operator.
...
Also deduplicated the 'mesh as shapekey' code, we had kind of two funcs
doing the same thing here...
2018-06-21 18:26:12 +02:00
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
43eebdfebd
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/collada/DocumentImporter.cpp
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_modifier.c
2018-06-12 12:58:31 +02:00
be57cf9b2a
Cleanup: remove moar G.main from BKE area.
2018-06-12 12:53:27 +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
54f9cd5283
Cleanup: Nuke moar G.main usages...
2018-06-07 11:11:46 +02:00
bb7202495a
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/collada/ArmatureExporter.cpp
source/blender/collada/ArmatureExporter.h
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentExporter.h
source/blender/collada/SceneExporter.cpp
source/blender/collada/SceneExporter.h
source/blender/collada/collada.cpp
source/blender/collada/collada.h
source/blender/editors/armature/armature_edit.c
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/include/ED_armature.h
source/blender/editors/include/ED_object.h
source/blender/editors/include/ED_screen.h
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_transform.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/stubs.c
2018-06-06 16:25:28 +02:00
48e871ab1d
Cleanup: Nuke moar G.main usages...
2018-06-06 15:50:24 +02:00
9e2ea6c500
Merge branch 'master' into blender2.8
2018-04-15 12:03:09 +02:00
0f2efce6c5
Cleanup: remove bad casts
2018-04-15 11:57:49 +02:00
c12d976020
Cleanup: ED_armature naming
...
- Wasn't clear which functions handle edit-bones.
- Mixed both ebone and edit_bone in names.
- Didn't use ED_armature_* prefix for public API.
See P655 to apply to branches.
2018-04-15 11:50:53 +02:00
ddae05cdca
Merge remote-tracking branch 'origin' into blender2.8
2018-03-11 23:45:53 +01:00
a2cc85b264
Cleanup Collada: Avoid unintentional reuse of previous defined variable
...
The variable child was redeclared multiple times in the same function.
While this has not created any issues i still changed this to avoid
confusion and keep the usage of the variables more local.
2018-03-11 20:59:49 +01:00
376fc19b24
fix:T53271 now using the context scene layer as requested
2018-01-26 13:37:45 +01:00
e9e703f0dd
Depsgraph: Remove old depsgraph header from collada
2017-04-06 16:17:21 +02:00
b48ba0909a
Collada - Import: now add bind_mat and rest_mat as custom properties (when the use_bind_info option is enabled)
2017-03-23 14:14:23 +01:00
092d673689
Added new option for storing bindpose matrix, see T50412
2017-03-23 14:14:22 +01:00
339d0170d1
collada: Simplify reading Node Matrix
2017-03-23 14:14:22 +01:00
1729dd9998
collada: Make sure that bone use_conncet is set to false when connect type is not defined in Import
2017-03-23 14:14:22 +01:00
33e32c341a
collada: add extern 'C' for c header includes
2017-03-23 14:14:22 +01:00
ec3989441f
fix: collada - Connected bones get their tails set to wrong location when fix leaf nodes option is enabled
2017-03-23 14:14:22 +01:00
1978ac65c4
collada: use local variable to avoid repeated call of bone chain_length_calculator
2017-03-23 14:14:22 +01:00
89631485cc
collada: use vector copy function instead of direct assigning
2017-03-23 14:14:22 +01:00
4877c9362a
Collada simplify: avoid duplicate negation in boolean
2017-03-14 19:31:25 +01:00
d464a7c441
fix T50118: Added missing assignment of Bone Roll
2016-11-26 18:48:50 +01:00
36d0ea3123
Collada: Trying to get rid of some warning messages on linux
2016-09-24 01:47:55 +02:00
7a259d8422
Collada: Trying to get rif of some warning messages on linux
2016-09-24 01:27:37 +02:00
4b891b40c2
Fix: Collada Importer did not import the Blender Profile information correctly when multiple objects are bound to same armature. This caused Bone tails to be placed wrong.
2016-09-24 01:06:32 +02:00
2382d1c401
regression fix for 1346482d23: The length of leaf bones should always be set to the length of the smallest bone. since the mentioned commit the importer did only recalculate the leaf bone length when the 'fix leaf bones' option was also enabled.
2016-09-20 17:33:17 +02:00
38410e6e25
changed use_connect from bool to a 3 state value (-1,0,1)
2016-06-03 18:31:51 +02:00
5366900ace
Added support for non numeric bone layer labels (could happen when importing from other tools)
...
Differential Revision: https://developer.blender.org/D2037
2016-05-29 00:37:46 +02:00
8e26111020
Collada: Adding support for bone roll and bone layers
...
Differential Revision: https://developer.blender.org/D2034
2016-05-28 19:22:06 +02:00
1346482d23
moved is_leaf_bone() to collada utils for reuse in exporter and importer
2016-05-26 18:22:36 +02:00
29aa13cfa2
fix: Import of meshes with holes is now reported as WARNING (unsupported)
...
improved: add support for bone tail export/import using Blender Collada profile
Differential Revision: https://developer.blender.org/D2031
2016-05-26 17:53:25 +02:00
1b8a4fd9bd
Fix T46444: Crash importing DAE w/ empty armature
2015-10-12 11:35:08 +11:00
fdc8b12726
Cleanup: whitespace, unused var
2015-08-06 13:03:07 +10:00
0525db39d1
fix T44648: Collada finding bone chains during import crashes when no bones are there
2015-05-10 11:04:37 +02:00
fca515838e
Cleanup: strcmp/strncmp -> STREQ/STREQLEN (in boolean usage).
...
Makes usage of those funcs much more clear, we even had mixed '!strcmp(foo, bar)'
and 'strcmp(foo, bar) == 0' in several places...
2015-01-26 16:59:24 +01:00
7a1dc20560
Cleanup: quite some harmless but noisy warnings from gcc...
2015-01-11 21:14:39 +01:00
e35b4bac0a
Collada Importer: Separated finding bone chains and fixing leaf bone orientations into 2 functions and added a separated import option
2014-12-01 20:31:59 +01:00
8d42c2f3ea
Improved Collada Armature Import
...
Collada does not support Bone length. It has only Joints.
This patch tries to improve the necessary "guesswork" for
importing Rigs.
Differential Revision: https://developer.blender.org/D920
2014-12-01 12:08:26 +01: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
617557b08e
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 15:22:28 +11:00
482201d1a0
Style cleanup
2014-03-31 05:46:19 +11:00
