griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
77,000 Commits 1 Branch 0 Tags
f71efafe8fc43083dcf573d258a1a5511d522702
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Bastien Montagne f71efafe8f Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/sculpt_paint/paint_image.c
	source/blender/editors/space_image/image_edit.c
	source/blender/editors/space_image/image_ops.c
	source/blender/makesrna/intern/rna_material.c
	source/blender/makesrna/intern/rna_sculpt_paint.c
	source/blender/makesrna/intern/rna_space.c
	source/blenderplayer/bad_level_call_stubs/stubs.c
2018-05-31 18:35:14 +02:00
build_files
Merge branch 'master' into blender2.8
2018-05-31 10:03:15 +02:00
doc
Collections and groups unification
2018-05-18 13:34:24 +02:00
extern
Merge remote-tracking branch 'origin/master' into blender2.8
2018-05-28 14:35:59 -06:00
intern
Minor tweaks to labels
2018-05-31 16:05:47 +02:00
release
UI: hide user preferences from space menu
2018-05-31 16:46:24 +02:00
source
Merge branch 'master' into blender2.8
2018-05-31 18:35:14 +02:00
tests
Merge branch 'master' into blender2.8
2018-05-27 11:06:29 +02:00
.arcconfig
Arc: Use proper lacding branch
2018-04-24 12:26:37 +02:00
.gitignore
Build: add scripts to build dependencies for Windows and macOS.
2017-08-07 17:46:06 +02:00
.gitmodules
Fix git submodules branch configuration
2018-04-23 12:55:04 +02:00
CMakeLists.txt
Merge remote-tracking branch 'origin/master' into blender2.8
2018-05-28 14:35:59 -06:00
COPYING
== docs ==
2010-10-13 14:44:22 +00:00
GNUmakefile
Merge remote-tracking branch 'origin/master' into blender2.8
2018-04-25 09:31:25 +02:00
make.bat
Merge branch 'master' into blender2.8
2018-05-27 11:06:29 +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%