sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
34,815 Commits 2 Branches 0 Tags 753 MiB
C++ 76%
Python 14.6%
C 5.2%
GLSL 1.8%
CMake 1.3%
Other 1%
cc3adc2202
Go to file
Tamito Kajiyama cc3adc2202 Merged changes in the trunk up to revision 43038. 
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c
2011-12-31 21:09:26 +00:00
build_files Merged changes in the trunk up to revision 43038. 2011-12-31 21:09:26 +00:00
doc Merged changes in the trunk up to revision 42902. 2011-12-27 22:12:46 +00:00
extern add UNLIKELY / LIKELY util defines to help optimize iterators that are called a lot, only defined for gcc at the moment. 2011-12-29 01:46:58 +00:00
intern Cycles code refactoring: change displace kernel into more generic shader 2011-12-31 15:18:13 +00:00
release Merged changes in the trunk up to revision 43038. 2011-12-31 21:09:26 +00:00
source Merged changes in the trunk up to revision 43038. 2011-12-31 21:09:26 +00:00
CMakeLists.txt option to build without remesh modifier for cmake and scons 2011-12-31 03:34:44 +00:00
COPYING == docs == 2010-10-13 14:44:22 +00:00
GNUmakefile minor changes 2011-11-23 17:14:29 +00:00
SConstruct option to build without remesh modifier for cmake and scons 2011-12-31 03:34:44 +00:00