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 d140e70c49 Merge branch 'master' into temp-ghash-experiments ...

Note that 'store hash' feature was removed for now - to complex to maintain (conflicts)
and relatively easy to re-add if we ever really want this one day.

Conflicts:
	source/blender/blenlib/BLI_ghash.h
	source/blender/blenlib/intern/BLI_ghash.c
	source/blender/blenlib/intern/hash_mm2a.c
	source/blender/bmesh/tools/bmesh_region_match.c
	tests/gtests/blenlib/BLI_ghash_performance_test.cc
	tests/gtests/blenlib/BLI_ghash_test.cc
	tests/gtests/blenlib/CMakeLists.txt

2015-06-29 17:18:11 +02:00

build_files

CMake: quiet warnings in GTest

2015-06-23 14:34:52 +10:00

doc

BGE: added clamping of angular velocity.

2015-06-28 12:54:53 +02:00

extern

CMake: quiet warnings in GTest

2015-06-23 14:34:52 +10:00

intern

Fix T45154: Translation binary file(blender.mo) for Japanese is too small

2015-06-29 12:27:59 +02:00

release

BGE: added clamping of angular velocity.

2015-06-28 12:54:53 +02:00

scons @ 625d446ae8

Fixed border extension for the sunbeams node.

2014-09-23 11:42:11 +02:00

source

Merge branch 'master' into temp-ghash-experiments

2015-06-29 17:18:11 +02:00

tests

Merge branch 'master' into temp-ghash-experiments

2015-06-29 17:18:11 +02:00

.arcconfig

Use HTTPS protocol for arc

2013-12-24 22:57:27 +06:00

.gitignore

Revert "ignore conflict files"

2014-08-08 06:00:49 +10:00

.gitmodules

Initialize git submodules for addons, locales and scons

2013-11-15 12:19:08 +06:00

CMakeLists.txt

CMake: set advanced var

2015-06-17 14:25:05 +10:00

COPYING

== docs ==

2010-10-13 14:44:22 +00:00

GNUmakefile

CMake: use functions instead of macros

2015-06-17 09:38:24 +10:00

SConstruct

Fix T44968: Python executable crashes due to missing .DLL

2015-06-10 13:41:06 +05:00

Description

Archive of Blender with old branches

823 MiB

Languages

C 67.4%

C++ 23.4%

Python 6.1%

CMake 1.5%

GLSL 1.1%

Other 0.4%