Blender Git Commit Log
Git Commits -> Revision 0ca96e1
Revision 0ca96e1 by Tamito Kajiyama (master) November 12, 2011, 23:12 (GMT) |
Merged changes in the trunk up to revision 41768. Conflicts resolved: source/blender/makesdna/intern/makesdna.c source/blender/makesrna/RNA_enum_types.h source/blender/render/intern/source/shadeinput.c source/blenderplayer/bad_level_call_stubs/stubs.c Additional changes: * source/blender/makesrna/intern/rna_linestyle.c: Fixed white space issues that generated a number of compiler errors. The problem was that two string literals for enumerating MA_RAMP_SOFT and MA_RAMP_LINEAR contained a space. The string literals are supposed to represent a valid C identifier because of their use for automatic code generation. * Stroke transparency has been temporarily disabled due to a functionality conflict with some merged changes. A fix of this issue is planned. |
Commit Details:
Full Hash: 0ca96e1eb1da42268c11c286c74e79ed31da2c37
SVN Revision: 41772
Parent Commits: 1ae159b, fc42a61