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
ad797ed39a
Fix blenderplayer and collada build.
2018-04-17 11:01:52 +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
4a892adac5
merge from master (needed to fix collada headerfiles which have been modified in master and in blender2.8 slightly different)
2018-02-28 17:29:56 +01:00
e73fe77ac0
collada: EvaluationContext is now feeded into the class instances of AnimationExporter and DocumentExporter on creation. Also skipped the const qualifier for now because BKE_scene_graph_update_for_newframe() needs it to be not const
2018-02-28 17:10:57 +01:00
a363324f7f
Collada: Make EvaluationContext const as its only used for reading here
2018-02-28 16:05:29 +01:00
91c3cfbb6f
collada: call from operator to Collada exporter/importer now uses structures instead of passing many parameters
2018-02-28 16:05:29 +01:00
01f732d97b
Collada: Moved structure definitions for export settings to the exportSettings.h Also make typedefs for import/export structures.
2018-02-28 16:05:28 +01:00
7dd0e36dc4
simplified collada integration in Blender. made functions mostly similar with blender2.8
2018-02-26 17:18:31 +01:00
4e95807db3
fix T47484: Added proper error reporting for Collada Exporter
2016-02-20 21:42:12 +01:00
bc8f602601
style cleanup
2012-10-20 18:46:57 +00:00
36ed4818e5
patch #31794 Collada: make exporter more robust, now uses BKE_object_relational_superset()
2012-06-12 21:25:29 +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
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
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
bcec824299
doxygen: COLLADA entry
2011-02-21 08:38:53 +00:00
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
a545998c84
Merge -c 29009,29081,29189 from COLLADA branch into trunk.
2010-06-03 17:41:33 +00:00
31258507d0
Merge of the COLLADA GSoC branch into trunk.
...
COLLADA code is disabled by default (it has dependencies requiring manual install).
SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch .
The detailed command log of the merge (can be useful for educational purposes):
branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook
# collada code
svn copy $branch/source/blender/collada source/blender/collada
# operator
svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c
# menu
svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py
# scons
svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript
svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py
svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py
svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py
svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py
svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py
svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript
# cmake
svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt
svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt
svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt
svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake
svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt
2009-10-30 15:35:50 +00:00
Bastien Montagne
Brecht Van Lommel
Gaia Clary
Campbell Barton
Nathan Letwory
Arystanbek Dyussenov