sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
37,770 Commits 2 Branches 0 Tags 753 MiB
C++ 76%
Python 14.6%
C 5.2%
GLSL 1.8%
CMake 1.3%
Other 1%
3b711a6ed0
Go to file
Tamito Kajiyama 3b711a6ed0 Merged changes in the trunk up to revision 45133. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c
2012-03-25 08:20:19 +00:00
build_files Merged changes in the trunk up to revision 45133. 2012-03-25 08:20:19 +00:00
doc Merged changes in the trunk up to revision 45133. 2012-03-25 08:20:19 +00:00
extern fix for cmake error on non osx systems 2012-03-23 10:39:59 +00:00
intern SVN maintenance. 2012-03-24 01:42:08 +00:00
release Merged changes in the trunk up to revision 45133. 2012-03-25 08:20:19 +00:00
source Merged changes in the trunk up to revision 45133. 2012-03-25 08:20:19 +00:00
CMakeLists.txt dont disable python when addons aren't found (addons are not needed for python to run) 2012-03-17 18:33:51 +00:00
COPYING == docs == 2010-10-13 14:44:22 +00:00
GNUmakefile Spelling Cleanup 2012-03-01 12:20:18 +00:00
SConstruct building without python works again, cleanup bmesh include paths (cmake and scons). 2012-03-08 03:25:53 +00:00