bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
94,592 Commits 2 Branches 0 Tags 745 MiB
C++ 76%
Python 14.6%
C 5.2%
GLSL 1.8%
CMake 1.3%
Other 1%
15cb567c8e
Go to file
Campbell Barton 15cb567c8e Armature: remove merge function, use dissolve instead 
This was crashing, when looking into a fix I noticed that it gave
hap-hazard results dissolving past forks in the parent/child hierarchy
arbitrarily following one chain.

This functionality is almost identical to "dissolve" which delimits
forks in the chain predictably.

So remove this in favor of dissolve (available from the delete menu).
2020-03-30 19:18:09 +11:00
.github Revert "Merge branch 'master' into blender-v2.81-release" 2019-10-11 21:31:58 +02:00
build_files Install_deps: Do not wipe out WITH_PYTHON CMake options. 2020-03-27 15:46:47 +01:00
doc Doc: remove MeshTessFace reference 2020-03-24 16:26:07 +11:00
extern Fluid: Updated manta pp files 2020-03-17 11:57:04 +01:00
intern Fluid: Optimization for liquid / secondary particle file loading 2020-03-29 21:31:20 +02:00
release Armature: remove merge function, use dissolve instead 2020-03-30 19:18:09 +11:00
source Armature: remove merge function, use dissolve instead 2020-03-30 19:18:09 +11:00
tests Test: update bl_run_operators blacklist, add volume object 2020-03-26 15:42:52 +11:00
.arcconfig Fix .arcconfig not working with latest arcanist version 2020-03-01 22:35:31 +01:00
.clang-format Cleanup: add iterator macros to clang-format 2020-03-27 11:28:20 +11:00
.editorconfig editorconfig: correct indent size 2019-04-17 13:34:46 +02:00
.gitignore Fluid: Added wavelet noise tile to the gitignore 2020-01-29 19:21:52 +01:00
.gitmodules Update for moving blender2.8 to master. 2018-12-21 12:15:21 +01:00
CMakeLists.txt Fix build errors with WITH_HEADLESS or WITH_GHOST_SDL 2020-03-18 15:19:41 +01:00
COPYING
GNUmakefile Build: use clang-format from precompiled libraries for make format on Linux 2020-02-15 13:44:20 +01:00
make.bat Build: add "make test" command for Windows, output log file 2019-09-12 20:23:03 +02:00
readme.rst readme: separate development links 2019-04-13 14:45:51 +02:00

readme.rst 

.. Keep this document short & concise,
   linking to external resources instead of including content in-line.
   See 'release/text/readme.html' for the end user read-me.


Blender
=======

Blender is the free and open source 3D creation suite.
It supports the entirety of the 3D pipeline-modeling, rigging, animation, simulation, rendering, compositing,
motion tracking and video editing.

.. figure:: https://code.blender.org/wp-content/uploads/2018/12/springrg.jpg
   :scale: 50 %
   :align: center


Project Pages
-------------

- `Main Website <http://www.blender.org>`__
- `Reference Manual <https://docs.blender.org/manual/en/latest/index.html>`__
- `User Community <https://www.blender.org/community/>`__

Development
-----------

- `Build Instructions <https://wiki.blender.org/wiki/Building_Blender>`__
- `Code Review & Bug Tracker <https://developer.blender.org>`__
- `Developer Forum <https://devtalk.blender.org>`__
- `Developer Documentation <https://wiki.blender.org>`__


License
-------

Blender as a whole is licensed under the GNU Public License, Version 3.
Individual files may have a different, but compatible license.

See `blender.org/about/license <https://www.blender.org/about/license>`__ for details.