41d4a19865
ClangFormat: format '#if 0' code in source/
2019-04-17 08:24:14 +02:00
e12c08e8d1
ClangFormat: apply to source, most of intern
...
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:21:24 +02:00
35b78d9807
Cleanup: indentation, wrapping
...
Mostly functions wrapping args, not confirming to our style guide.
2019-03-15 09:54:30 +11:00
de13d0a80c
doxygen: add newline after \file
...
While \file doesn't need an argument, it can't have another doxy
command after it.
2019-02-18 08:22:12 +11:00
eef4077f18
Cleanup: remove redundant doxygen \file argument
...
Move \ingroup onto same line to be more compact and
make it clear the file is in the group.
2019-02-06 15:45:22 +11:00
65ec7ec524
Cleanup: remove redundant, invalid info from headers
...
BF-admins agree to remove header information that isn't useful,
to reduce noise.
- BEGIN/END license blocks
Developers should add non license comments as separate comment blocks.
No need for separator text.
- Contributors
This is often invalid, outdated or misleading
especially when splitting files.
It's more useful to git-blame to find out who has developed the code.
See P901 for script to perform these edits.
2019-02-02 01:36:28 +11: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
376fc19b24
fix:T53271 now using the context scene layer as requested
2018-01-26 13:37:45 +01: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
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
e353593b30
fix : #36060 Collada Import: animated armature+mesh problem
2013-07-14 17:21:12 +00:00
4507dd9a7e
Removed unused paramter from ArmatureImporter:add_joint()
2013-07-14 16:24:42 +00:00
1777a69818
misc minor edits.
...
- pass string size to BLI_timestr() to avoid possible buffer overrun.
- quiet warning for mingw.
- include guards for windows utf conversion funcs.
- fix for mistage in edge-angle-selection check.
- some style cleanup.
2013-03-29 06:25:22 +00:00
4f3ca854e1
Fix various warnings with clang build, and adjust cmake clang warnings flags
...
to include a few more that gcc is using too.
2013-02-26 21:58:06 +00:00
c263753d17
Added gsoc-2012 collada improvements from bratwurst branch
2013-01-21 13:45:49 +00:00
7c699a217a
define the size of matrix args for both rows/cols.
2012-12-11 14:29:01 +00:00
5549904171
style cleanup
2012-10-29 02:11:40 +00:00
e701f9b670
style cleanup: whitespace / commas
2012-04-29 15:47:02 +00:00
2b7ca2304a
unify include guard defines, __$FILENAME__
...
without the underscores these clogged up the namespace for autocompleation which was annoying.
2012-02-17 18:59:41 +00:00
e84c0980a3
correct indentation and some whitespace edits (no functional changes)
2011-11-11 13:09:14 +00:00
699030ceb6
use const for readonly strings and set some functions to static
2011-10-27 14:41:26 +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
Nathan Letwory
1764f2135d
Some whitespace changes
2011-09-04 00:15:59 +00:00
6b99cd05aa
Armature object animations export.
2011-08-21 15:47:21 +00:00
40e36975ef
Blender profile leaf bone tip import.
2011-07-26 18:28:07 +00:00
87f242fab0
set_pose function completed. Algorithms to be checked.
...
(Still not the desired results )
2011-06-26 18:56:06 +00:00
12e5d69af0
pose channel -> pose matrix import ( in progress )
2011-06-26 15:35:02 +00:00
28f0d96bea
2011-06-19 04:20:43 +00:00
3f0e480ba9
unskinned armature import improved but unfinished.
2011-06-17 20:01:24 +00:00
c9b0ce8693
creating armatures for bones which are not skinned( in progress )
2011-06-17 18:41:43 +00:00
Nathan Letwory
bcec824299
doxygen: COLLADA entry
2011-02-21 08:38:53 +00:00
Nathan Letwory
c5077e1ede
Fix [ #24359 ] Collada: end bone zero size, mysterious extra empty
...
Reported by Thomas Larsson
Fix by Jeroen Bakker
Fix max length of leaf bone and remove empty.
2010-12-21 10:43:47 +00:00
9f3d203acb
SVN maintenance.
2010-10-05 00:49:39 +00:00
Nathan Letwory
82209cdc86
Reorganisation of COLLADA import code. Classes have been split into their own files.
...
No functional changes.
Where necessary extern "C" {} blocks have been added.
2010-10-05 00:05:14 +00:00
