griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
2676f2d58f71f438008b413a86b873e7787d80ea
test2/source/blender
History
Tamito Kajiyama 2676f2d58f Merged changes in the trunk up to revision 42021. 
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c
2011-11-20 21:02:12 +00:00
..
avi
correct indentation and some whitespace edits (no functional changes)
2011-11-11 13:09:14 +00:00
blenfont
Moving spanish code from es_ES to es for now (as the best spanish translation is es.po...).
2011-11-18 09:16:29 +00:00
blenkernel
Merged changes in the trunk up to revision 42021.
2011-11-20 21:02:12 +00:00
blenlib
Merged changes in the trunk up to revision 42021.
2011-11-20 21:02:12 +00:00
blenloader
Merged changes in the trunk up to revision 42021.
2011-11-20 21:02:12 +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
correct indentation and some whitespace edits (no functional changes)
2011-11-11 13:09:14 +00:00
editors
Merged changes in the trunk up to revision 42021.
2011-11-20 21:02:12 +00:00
freestyle
Fix for duplicated feature edges due to a numerical instability of line
2011-11-20 19:03:52 +00:00
gpu
Muting node patch: second part. Also fix [#27636] Muting shading nodes is ignored
2011-11-20 16:38:23 +00:00
ikplugin
Fix #29041: parenting problem with tree IK for iTaSC and iksolver, where it
2011-11-13 13:08:15 +00:00
imbuf
Fix #29295: Problem with Alpha Channel video in Sequencer and textures
2011-11-20 16:26:37 +00:00
makesdna
Merged changes in the trunk up to revision 42021.
2011-11-20 21:02:12 +00:00
makesrna
Merged changes in the trunk up to revision 42021.
2011-11-20 21:02:12 +00:00
modifiers
share code for fluidsim, ocean & dynamic paint file paths.
2011-11-20 14:38:11 +00:00
nodes
Fix for crasher when node group tree datablocks are missing.
2011-11-20 16:57:50 +00:00
python
Merged changes in the trunk up to revision 42021.
2011-11-20 21:02:12 +00:00
quicktime
correct indentation and some whitespace edits (no functional changes)
2011-11-11 13:09:14 +00:00
render
Merged changes in the trunk up to revision 42021.
2011-11-20 21:02:12 +00:00
windowmanager
patch [#28993] wm_window_match_do(): Fix crash on null pointer dereference
2011-11-15 16:38:48 +00:00
CMakeLists.txt
Merged changes in the trunk up to revision 41768.
2011-11-12 23:12:30 +00:00
SConscript
Merged changes in the trunk up to revision 41768.
2011-11-12 23:12:30 +00:00