griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
0896a227232f741b6028219a208ae60e78515406
test2/source/blender
History
Tamito Kajiyama 0896a22723 Merged changes in the trunk up to revision 42902. 
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/python/intern/bpy.c
2011-12-27 22:12:46 +00:00
..
avi
style edit only - move parenthesis onto second line of function definition (in keeping with most of blenders code)
2011-12-17 00:52:36 +00:00
blenfont
* Fixing compile after recent i18 commits.
2011-12-27 01:35:39 +00:00
blenkernel
Merged changes in the trunk up to revision 42902.
2011-12-27 22:12:46 +00:00
blenlib
Merged changes in the trunk up to revision 42902.
2011-12-27 22:12:46 +00:00
blenloader
Merged changes in the trunk up to revision 42902.
2011-12-27 22:12:46 +00:00
blenpluginapi
pass image description to image loading functions for more useful error than 'Unknown fileformat'.
2011-10-27 04:24:34 +00:00
collada
Math lib: matrix multiplication order fix for two functions that were
2011-12-16 19:53:12 +00:00
editors
Merged changes in the trunk up to revision 42902.
2011-12-27 22:12:46 +00:00
freestyle
Added SVertex::curvatures() in the Python API to retrieve curvature
2011-12-17 19:31:30 +00:00
gpu
Cleaning up the GPU_extensions_init/exit() code a bit to keep the Blenderplayer from crashing on exit and restart.
2011-12-23 07:10:01 +00:00
ikplugin
Math lib: matrix multiplication order fix for two functions that were
2011-12-16 19:53:12 +00:00
imbuf
Code refactoring: move MD5 out of imbuf into blenlib.
2011-12-21 13:48:51 +00:00
makesdna
Merged changes in the trunk up to revision 42902.
2011-12-27 22:12:46 +00:00
makesrna
Merged changes in the trunk up to revision 42902.
2011-12-27 22:12:46 +00:00
modifiers
remove unneeded casts from 'unsigned int' to 'int'
2011-12-27 03:54:23 +00:00
nodes
patch [#29676] ALPHA OVER: Fix associated alpha over situation to fix [#29675] patch by Troy Sobotka
2011-12-21 23:59:57 +00:00
python
Merged changes in the trunk up to revision 42902.
2011-12-27 22:12:46 +00:00
quicktime
OSX: adding PNG codec to QTKit, to have one more alpha enabled one atm
2011-12-27 11:29:27 +00:00
render
Merged changes in the trunk up to revision 42902.
2011-12-27 22:12:46 +00:00
windowmanager
option to save as older mesh format (ifdef'd for now)
2011-12-27 13:17:58 +00:00
CMakeLists.txt
Merged changes in the trunk up to revision 42425.
2011-12-05 02:12:49 +00:00
SConscript
Merged changes in the trunk up to revision 41768.
2011-11-12 23:12:30 +00:00