sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
40,118 Commits 2 Branches 0 Tags 753 MiB
C++ 76%
Python 14.6%
C 5.2%
GLSL 1.8%
CMake 1.3%
Other 1%
1f7ae143a2
Go to file
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