bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
42,742 Commits 2 Branches 0 Tags 745 MiB
C++ 76%
Python 14.6%
C 5.2%
GLSL 1.8%
CMake 1.3%
Other 1%
15ed834343
Go to file
Tamito Kajiyama 15ed834343 Merged changes in the trunk up to revision 51718. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_scene.c
release/datafiles/startup.blend
2012-10-29 01:09:12 +00:00
build_files Merged changes in the trunk up to revision 51718. 2012-10-29 01:09:12 +00:00
doc Merged changes in the trunk up to revision 51718. 2012-10-29 01:09:12 +00:00
extern Merged changes in the trunk up to revision 51718. 2012-10-29 01:09:12 +00:00
intern style cleanup 2012-10-28 15:23:16 +00:00
release Merged changes in the trunk up to revision 51718. 2012-10-29 01:09:12 +00:00
source Merged changes in the trunk up to revision 51718. 2012-10-29 01:09:12 +00:00
CMakeLists.txt Fix for cmake syntax error: LLVM_VERSION string was not configurable, causing linker errors for people not using the default LLVM version (3.0 on Linux, 3.1 on OSX). 2012-10-25 14:31:52 +00:00
COPYING == docs == 2010-10-13 14:44:22 +00:00
GNUmakefile code cleanup: add check spelling osl 2012-10-17 01:53:29 +00:00
SConstruct remove LOD_Decimator (c++ decimator), now replaced by bmesh decimator. also remove CTR c++ classes that are no longer used. 2012-10-22 02:39:26 +00:00