Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-06-06Merge branch 'master' into blender2.8Bastien Montagne
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-06Cleanup: Nuke moar G.main usages...Bastien Montagne
2018-04-16Depsgraph: remove EvaluationContext, pass Depsgraph instead.Brecht Van Lommel
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-02-28merge from master (needed to fix collada headerfiles which have been ↵Gaia Clary
modified in master and in blender2.8 slightly different)
2018-02-28collada: EvaluationContext is now feeded into the class instances of ↵Gaia Clary
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-28collada: call from operator to Collada exporter/importer now uses structures ↵Gaia Clary
instead of passing many parameters
2018-02-27merge from masterGaia Clary
2018-02-26simplified collada integration in Blender. made functions mostly similar ↵Gaia Clary
with blender2.8
2018-02-26Adding support for Matrix Transformation exportGaia Clary
The exporter does export matrix data (4*4 Transformation matrix) only for Skeletal animation. For object animation only exporting to trans/rot/loc is implemented. This task implements Matrix export also for simple Object animation. Differential Revision: https://developer.blender.org/D3082
2018-02-26Revert "changing collada parameters"Campbell Barton
This reverts commit d91f2ac37aa02d96a00d116fa55cdc9f55afd32c. This change makes scene.collada_export() meaningless (ignoring the scene the method is being run on).
2018-02-25merged collada rework from master into blender 2.8Gaia Clary
2018-02-25changing collada parametersGaia Clary
Differential Revision: https://developer.blender.org/D3080
2018-02-24T45687: Rework the Export/Import of AnimationsGaia Clary
This started with a fix for an animated Object Hierarchy. Then i decided to cleanup and optimize a bit. But at the end this has become a more or less full rewrite of the Animation Exporter. All of this happened in a separate local branch and i have retained all my local commits to better see what i have done. Brief description: * I fixed a few issues with exporting keyframed animations of object hierarchies where the objects have parent inverse matrices which differ from the Identity matrix. * I added the option to export sampled animations with a user defined sampling rate (new user interface option) * I briefly tested Object Animations and Rig Animations. What is still needed: * Cleanup the code * Optimize the user interface * Do the Documentation Reviewers: mont29 Reviewed By: mont29 Differential Revision: https://developer.blender.org/D3070
2017-11-23Rename any instance of scene layer or render layer in code with view layerDalai Felinto
The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-08-16Pass EvaluationContext instead of bContextCampbell Barton
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-07-21Pass EvaluationContext argument everywhereLuca Rood
Note that some little parts of code have been dissabled because eval_ctx was not available there. This should be resolved once DerivedMesh is replaced.
2017-06-24collada: change image export: export either UV Textures or Materials. ThisGaia Clary
avoids wrong texture data when multiple objects are exported. Note: This commit might possiblyt not work fully. The full feature is added with the next commit)
2017-05-24Remove TexFace, per-face imagesCampbell Barton
TexFace complicates the now more popular shading pipeline by having per-face images, see: T51382 for details. To keep the ability to select a per-material edit-image (used with UV-mapping workflow), the material now stores an image which will be set when changing images in edit-mode. This is used as a bake-target when not using Cycles too.
2017-04-04Collada export cleanupDalai Felinto
2017-04-04Fix collada exporting for Blender 2.8Dalai Felinto
Instead of exporting all the scene objects, I'm exporting the scene layer objects instead.
2017-04-03Collada - add flag to limit precision of exported data, mainly to simplify ↵Gaia Clary
debugging
2017-04-03fix: collada - do proper conversion from int to bool (as with other nearby ↵Gaia Clary
parameters)
2017-03-23Added new option for storing bindpose matrix, see T50412Gaia Clary
2016-06-03changed use_connect from bool to a 3 state value (-1,0,1)Gaia Clary
2016-05-26fix: Import of meshes with holes is now reported as WARNING (unsupported)Gaia Clary
improved: add support for bone tail export/import using Blender Collada profile Differential Revision: https://developer.blender.org/D2031
2016-04-29Cleanup: warnings. spellingCampbell Barton
2016-02-20fix T47484: Added proper error reporting for Collada ExporterGaia Clary
2015-06-12BLI_linklist, avoid full list search for appendCampbell Barton
For areas that require append, store the last node, Previous behavior would too easily hide poorly performing code. Also avoid (prepend, reverse) where possible.
2014-12-01Collada Importer: Separated finding bone chains and fixing leaf bone ↵Gaia Clary
orientations into 2 functions and added a separated import option
2014-12-01Improved Collada Armature ImportGaia Clary
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-09-30fix T42022 Attempt to export empty set of objects resulted in an exceptiongaiaclary
2013-10-03Changed some labels from Second Life to OpenSimGaia Clary
2013-08-24Fix 36505: Collada exporter crashes Blender when exporting to locked fileGaia Clary
2013-03-07Collada: Added option for how rot,loc,trans data is exported (improves ↵Gaia Clary
flexibility for support of other 3D tools)
2013-03-05patch [#34103] fileops_1.patchCampbell Barton
from Lawrence D'Oliveiro (ldo) Add comments and use of bool type in fileops.c
2013-03-02Collada: Added support for ngon export/import and added triangulate option ↵Gaia Clary
to export
2013-02-27Collada export: Add ngon support (initial)Gaia Clary
2013-02-15Fix: Collada Import files with X_UP and Y_UP axis where imported with wrong ↵Gaia Clary
orientation
2013-02-09[#33437](partial fix) Collada: importing a scene changes units. Added an ↵Gaia Clary
option to disable unit settings during import.
2013-01-21Added gsoc-2012 collada improvements from bratwurst branchGaia Clary
2012-09-19Collada(exporter): Added error message when export file can not be created ↵Gaia Clary
for whichever reason
2012-06-24Added option for exporting material based textures. Cleaned up header files ↵Gaia Clary
due to a bug in osx
2012-06-22Collada: (Export) Added export of surface textures, and control over ↵Gaia Clary
exported uv layers
2012-06-17Collada: (Exporter) add 'mesh type selection(view|render)' for Apply ↵Gaia Clary
modifiers option
2012-06-16code cleanup: colladaCampbell Barton
- when bubble sorting names - dont convert to str::string just to compare strings - use BLI_linklist_index() to check if an item is in the list - quiet some warnings
2012-06-16Collada: (Exporter) Add new option 'deform bones only'Gaia Clary
2012-06-14Collada: Added export Option 'sort by object name' to fix an issue with ↵Gaia Clary
Second Life import
2012-06-13style cleanupCampbell Barton
2012-06-13patch #31794 Collada: make exporter more robust, now uses ↵Gaia Clary
BKE_object_relational_superset()
2012-06-07[#31739] Collada: New Export selections 'Include Armatures'Gaia Clary