griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
68ae82bb479a79de72cf174763f3244f64e28bb0
test/source/blender
History
Tamito Kajiyama 68ae82bb47 Merged changes in the trunk up to revision 43585. 
Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
2012-01-21 23:01:25 +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
use BLI_strncpy and BLI_snprintf when the size of the string is known.
2012-01-11 12:33:51 +00:00
blenkernel
Merged changes in the trunk up to revision 43585.
2012-01-21 23:01:25 +00:00
blenlib
Merged changes in the trunk up to revision 43585.
2012-01-21 23:01:25 +00:00
blenloader
Merged changes in the trunk up to revision 43585.
2012-01-21 23:01:25 +00:00
blenpluginapi
change filepath limit from 240 to 1024
2012-01-21 14:54:53 +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 43585.
2012-01-21 23:01:25 +00:00
freestyle
Fix for color management not working properly with Freestyle.
2012-01-21 21:58:47 +00:00
gpu
remove ARB_texture_gather from bicubic bump map dependencies. It will be needed when/if monochrome images are supported
2012-01-18 00:03:09 +00:00
ikplugin
Math lib: matrix multiplication order fix for two functions that were
2011-12-16 19:53:12 +00:00
imbuf
change filepath limit from 240 to 1024
2012-01-21 14:54:53 +00:00
makesdna
Merged changes in the trunk up to revision 43585.
2012-01-21 23:01:25 +00:00
makesrna
Merged changes in the trunk up to revision 43585.
2012-01-21 23:01:25 +00:00
modifiers
comment some dead assibnment and set dummy values for image profile conversion in case of invalid input.
2012-01-20 15:18:57 +00:00
nodes
Fix for missing NULL check in socket default_value free function. Some sockets (currently only cycles shader sockets) don't actually have a default_value pointer.
2012-01-21 16:36:06 +00:00
python
Merged changes in the trunk up to revision 43585.
2012-01-21 23:01:25 +00:00
quicktime
Fix related to #29694: quicktime export was not showing or respecting RGBA
2012-01-12 21:10:46 +00:00
render
Merged changes in the trunk up to revision 43585.
2012-01-21 23:01:25 +00:00
windowmanager
change filepath limit from 240 to 1024
2012-01-21 14:54:53 +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