Sergey Sharybin f2873b3ce5 Multires: Prevent crash when joining two multires objects ...

This only works thing around, just so we can unlock production here.
Joining objects of a different scale will not yet work correctly.

Proper fix is coming later (the code needs to be ported to new
Subdiv API).

2018-11-02 11:00:51 +01:00

build_files

Merge remote-tracking branch 'origin/master' into blender2.8

2018-10-30 17:39:20 -06:00

doc

Update gpu offscreen PyAPI example

2018-10-26 12:13:03 +11:00

extern

Merge branch 'master' into blender2.8

2018-09-12 15:54:07 +10:00

intern

UI Cycles: Open "Sampling" panel by default

2018-11-02 02:29:09 +01:00

release

Tool System: brushes are now categorized by tool

2018-11-02 19:40:39 +11:00

source

Multires: Prevent crash when joining two multires objects

2018-11-02 11:00:51 +01:00

tests

Merge branch 'master' into blender2.8

2018-10-09 08:46:00 +11:00

.arcconfig

Arc: Use proper lacding branch

2018-04-24 12:26:37 +02:00

.editorconfig

editorconfig: correct C/C++ using space

2018-06-19 07:48:12 +02:00

.gitignore

Revert "Gitignore: Ignore diffs in all subdirs"

2018-07-31 13:03:48 -04:00

.gitmodules

Point addons contrib to 2.8 branch

2018-10-23 09:41:12 +02:00

CMakeLists.txt

Merge remote-tracking branch 'origin/master' into blender2.8

2018-10-22 10:19:06 -06:00

COPYING

== docs ==

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

GNUmakefile

Fix "make update" on macOS/Linux not updating addons to the blender2.8 branch.

2018-10-30 14:43:09 +01:00

make.bat

Cleanup: trailing space cmake, make.bat

2018-06-17 20:18:09 +02:00

Description

No description provided

841 MiB

Languages

C++ 78%

Python 14.9%

C 2.9%

GLSL 1.9%

CMake 1.2%

Other 0.9%