This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.

Bastien Montagne e44743736f Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/io/io_collada.c
	source/blender/editors/object/object_bake.c
	source/blender/editors/object/object_edit.c
	source/blender/editors/render/render_internal.c
	source/blender/makesrna/intern/rna_object_api.c
	source/blenderplayer/bad_level_call_stubs/stubs.c

2018-06-01 17:26:36 +02:00

..

config

Remove Frame Server

2018-05-09 12:50:26 +02:00

example_scripts

make_quickie: replace os.system w/ subprocess.call

2018-01-26 12:53:42 +11:00

Modules

Math: optimizations for 4x4x matrix inverse, multiplications.

2018-06-01 12:00:11 +02:00

platform

Merge branch 'master' into blender2.8

2018-06-01 17:26:36 +02:00

buildinfo.cmake

Cleanup: code style & cmake

2017-03-12 02:47:53 +11:00

clang_array_check.py

Cleanup: pep8

2016-07-30 18:17:11 +10:00

cmake_consistency_check_config.py

CMake: include missing headers

2018-02-09 13:50:05 +11:00

cmake_consistency_check.py

Tests: fix incorrect check for hidden dir

2017-08-23 15:36:39 +10:00

cmake_netbeans_project.py

Cleanup: spelling

2017-04-27 21:41:03 +10:00

cmake_qtcreator_project.py

Cleanup: pep8

2016-07-30 18:17:11 +10:00

cmake_static_check_clang_array.py

Cleanup: pep8

2016-07-30 18:17:11 +10:00

cmake_static_check_cppcheck.py

Cleanup: pep8

2016-07-30 18:17:11 +10:00

cmake_static_check_smatch.py

Cleanup: pep8

2016-07-30 18:17:11 +10:00

cmake_static_check_sparse.py

Cleanup: pep8

2016-07-30 18:17:11 +10:00

cmake_static_check_splint.py

Cleanup: pep8

2016-07-30 18:17:11 +10:00

macros.cmake

Merge branch 'master' into blender2.8

2018-06-01 17:26:36 +02:00

packaging.cmake

CMake: remove git found message

2017-12-06 16:37:50 +11:00

project_info.py

project_info: replace os.system w/ subprocess.check_call

2018-01-26 12:38:07 +11:00

project_source_info.py

Cleanup: pep8

2016-07-30 18:17:11 +10:00

RpmBuild.cmake

when building blender as a py module use add_library(... MODULE on all systems, was SHARED on linux/windows.

2012-01-11 00:09:46 +00:00