griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
40,118 Commits 1 Branch 0 Tags
1f7ae143a29b090ed97cdd7eb47a9c2dbd7f72a2
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Tamito Kajiyama 1f7ae143a2 Merged changes in the trunk up to revision 48227. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/filelist.c
2012-06-24 10:29:26 +00:00
build_files
Merged changes in the trunk up to revision 48227.
2012-06-24 10:29:26 +00:00
doc
Merged changes in the trunk up to revision 48227.
2012-06-24 10:29:26 +00:00
extern
Merged changes in the trunk up to revision 48227.
2012-06-24 10:29:26 +00:00
intern
style cleanyp
2012-06-23 23:22:19 +00:00
release
Merged changes in the trunk up to revision 48227.
2012-06-24 10:29:26 +00:00
source
Merged changes in the trunk up to revision 48227.
2012-06-24 10:29:26 +00:00
CMakeLists.txt
add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed.
2012-06-23 14:23:44 +00:00
COPYING
== docs ==
2010-10-13 14:44:22 +00:00
GNUmakefile
cmake edits
2012-05-27 10:03:13 +00:00
SConstruct
option to disable feather, since its so slow - for interactively editing masks its useful to be able to disable.
2012-06-21 12:27:57 +00: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%