Revision 98bdf02 by Campbell Barton January 8, 2012, 13:09 (GMT) |
svn merge ^/trunk/blender -r43183:43220 |
Revision 76a211d by Tamito Kajiyama January 8, 2012, 11:57 (GMT) |
Merged changes in the trunk up to revision 43219. Conflicts resolved: source/blender/blenkernel/intern/scene.c source/blender/blenloader/intern/readfile.c source/blender/render/intern/source/pipeline.c |
Revision 3dead22 by Lukas Toenne January 8, 2012, 10:23 (GMT) |
Improved auto-hiding of unused sockets for collapsed nodes. Instead of generally hiding all unused sockets in collapsed mode, the sockets now have a new explicit flag SOCK_AUTO_HIDDEN, which is only toggled when the hide_toggle operator is called. This way the auto-hidden sockets stay as they are when nodes are duplicated etc. The new flag is necessary to distinguish between manually hidden sockets (via hide_sockets_toggle operator) and automatically hidden sockets and restore the node state when unhiding a node. |
Revision d6e0d0f by Alexander Kuznetsov January 8, 2012, 05:10 (GMT) |
Fix for [#28978] Disabling mode switching in panning in 2d as it is disabled in 3d also. Apparently, it is a not good idea to call modal method from a modal method as the last won't be canceled. |
Revision fd88925 by Joshua Leung January 8, 2012, 04:14 (GMT) |
Code cleanup Removing some old + unused stuff that's not coming back. For example, the code for the old "specials menu" used everywhere/all contexts. |
Revision da84f3d by Andrew Wiggin January 7, 2012, 21:16 (GMT) |
Fix build break with double-definition of EXR stubs A better solution would be to mark all function in openexr_multi.h as forceinline or static, but this change just fixes it to work for the reason trunk works: the header defining the stubs is only needs to be included in one .c file |
Revision cce23a7 by Andrew Wiggin January 7, 2012, 20:53 (GMT) |
Fix broken normals with mirror modifier |
Revision 549c75f by Thomas Dinges January 6, 2012, 22:55 (GMT) |
Fix for last commit, missed check for ob, could cause errors when object was removed. |
Revision d919c30 by Sergey Sharybin January 6, 2012, 21:25 (GMT) |
More whitespace cleanup in python scripts |
Revision 2899e55 by Sergey Sharybin January 6, 2012, 21:24 (GMT) |
Whitespace cleanup in curve properties script |
Revision 491fe9d by Sergey Sharybin January 6, 2012, 17:32 (GMT) |
Fix #29568: Blender restores deleted scene Special notifiers used for scene deletion which lead to undo pushes after SCENE_OT_delete operator happening with scene still present in the mainfile. That was a reason why operator redo used to restore scene. It's not so obvious why special notifier type is needed for scene set and deletion -- it confuses undo system without having some obvious advantages. Using "direct" scene deletion and setting seems to be working fine so let's see if there'll be some issues with this. |
Revision 5ba14fd by Diego Borghetti January 6, 2012, 16:40 (GMT) |
Move glTexEnvi to draw__start/draw__end. As Campbell point, this is to avoid call glGet/glTexEnvi on each character. |
Revision 7ff5a17 by Thomas Dinges January 6, 2012, 16:37 (GMT) |
Tweaks for Node Header UI code: * Don't show "New material" operator, when object type can't have materials * Don't show "Use Nodes" for lamps in Blender Internal. |
Revision 667ae77 by Sergey Sharybin January 6, 2012, 10:08 (GMT) |
Fix #29743: Video sequencer wipe effect bug Blur width used to be calculated quite strange depending on current angle. Also, it used to be using wrong formula to calculate distance between current point and boundary line which made blur width almost useless. Now actual blur width is doesn't depend on angle and use corrected formula for distance calculation which makes blur width slider behaves more predictable. This commit might make old files using wipe+blur be rendered a bit differently, but don't think it's indeed issue because old behavior was crappy to setup something useful so don't think this setup was used a lot. |
Revision 68fd186 by Campbell Barton January 6, 2012, 05:13 (GMT) |
use warnigns for all msvc configurations |
Revision f6c5744 by Joshua Leung January 6, 2012, 04:07 (GMT) |
Bumping up scons+msvc warning level to w1 so that we at least get some warnings out of it. |
Revision 1e23a2b by Joshua Leung January 6, 2012, 04:03 (GMT) |
Bugfix [#29806] World nodetrees not included in Animation Editor filtering This was mostly only a problem when using Cycles, where NodeTrees are used to control the world settings. Also needed to knock out a few remnants of some bygone attempted optimisation attempts which were preventing this from working (i.e. if a world block didn't have any animdata, it's child nodetree would never get seen/tested). These worked ok in the past, but are not that flexible for extension. |
Revision be1bc0e by Campbell Barton January 6, 2012, 02:59 (GMT) |
rename * CDDM_calc_edges --> CDDM_calc_edges_tessface * CDDM_calc_edges_poly --> CDDM_calc_edges |
Revision dd858d6 by Thomas Dinges January 6, 2012, 01:31 (GMT) |
Cycles / Nodes: * Make it possible to add a new material from the Node header, if no material exists in the (active) material slot. |
Revision f983fe7 by Thomas Dinges January 6, 2012, 01:14 (GMT) |
3DView / Properties Region: * Simplify UI inside the Transform Orientation Panel. |
|
|
|


Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021