Blender Git Commit Log
Git Commits -> Revision 28f1fdd
Revision 28f1fdd by Dalai Felinto (tile) February 1, 2012, 23:22 (GMT) |
svn merge ^/trunk/blender -r43091:43824(HEAD) Conflicted file manually update: =============================== readfile.c Note 1: ======= The Double Edge Mask is not in tile since it's not a simple convert. The author of this node is aware of it and should have it working there eventually. (I'm going to add it in COM_Converter.cpp in a next commit) Note 2: ======= In COM_compositor.cpp we are passing only "Compositing" instead of what we have in trunk "Compositing 1 Gamma" If we decide to go with trunk then we need to incorporate the 43283 and 43287 commits. Something like: COM_compositor.cpp:51 - editingtree->stats_draw(editingtree->sdh, (char*)"Compositing"); + char str[128]; + BLI_snprintf(str, sizeof(str), "Compositing %d %s", curnode, node->name) + editingtree->stats_draw(editingtree->sdh, str); |
Commit Details:
Full Hash: 28f1fdd39bbb11b1081594e2f41bebef77a31518
SVN Revision: 43831
Parent Commits: 6b39a47, d882f05