griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
b8a67c236227bc74ca8ab8b492638f9cc85b3c88
test/source/blender
History
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
..
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 43038.
2011-12-31 21:09:26 +00:00
blenlib
Merged changes in the trunk up to revision 43038.
2011-12-31 21:09:26 +00:00
blenloader
Merged changes in the trunk up to revision 43038.
2011-12-31 21:09:26 +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
style edits for function declarations
2011-12-30 07:55:15 +00:00
editors
Merged changes in the trunk up to revision 43038.
2011-12-31 21:09:26 +00:00
freestyle
Added SVertex::curvatures() in the Python API to retrieve curvature
2011-12-17 19:31:30 +00:00
gpu
Fix #29715: cycles and glsl normal node not working correct.
2011-12-28 19:42:22 +00:00
ikplugin
Math lib: matrix multiplication order fix for two functions that were
2011-12-16 19:53:12 +00:00
imbuf
Color management: add "Color Unpremultiply" option for images and render settings.
2011-12-30 14:17:11 +00:00
makesdna
Merged changes in the trunk up to revision 43038.
2011-12-31 21:09:26 +00:00
makesrna
Merged changes in the trunk up to revision 43038.
2011-12-31 21:09:26 +00:00
modifiers
Fix [#29728] Explode Modifier Causes Crash.
2011-12-31 15:10:38 +00:00
nodes
Color management: add "Color Unpremultiply" option for images and render settings.
2011-12-30 14:17:11 +00:00
python
Merged changes in the trunk up to revision 43038.
2011-12-31 21:09:26 +00:00
quicktime
style edits for function declarations
2011-12-30 07:55:15 +00:00
render
Merged changes in the trunk up to revision 43038.
2011-12-31 21:09:26 +00:00
windowmanager
more changes from bmesh into trunk (mesh mpoly strict member)
2011-12-28 14:21:51 +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