Blender Git Loki

added a peak memory statistic

fixed drawing of weights in strand particle edit mode, yay

adding up/down buttons for moving vgroups in the stack

NULL a collision modifier field on load

{forgot this file, added a sanity check.} don't allow modifiers (e.g. cloth) after multires if in sculpt mode; should fix 22021. more work is needed, since while it doesn't crash anymore, you also can't sculpt without manually disabling the modifiers.

don't allow modifiers (e.g. cloth) after multires if in sculpt mode; should fix 22021. more work is needed, since while it doesn't crash anymore, you also can't sculpt without manually disabling the modifiers.

quad view modifies global view3d data appropriately, fixes 22111.

mask modifier properly works in weightpaint and edit modes now. note that modifiers should not have to provide a applyModifierEM function, there's really no reason to not pull the result from applyModifier if applyModifierEM doesn't exist, it's not like we don't have a dozen *EM functions that do just that, anyway. fixes 22192

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28505:28522

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28496:28505

branching for GSOC 2010

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28488:28496

enforce modifier name uniqueness on file load

hair tweak

Render Branch: Fix crash opening certain files with texture nodes
and displacement modifiers.

Render Branch: Fix image tile cache crash with displacement modifier
and preview render running at the same time, now the main thread and
thread 0 for rendering have a separate cache.

hair update

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28485:28488

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28473:28485

hair collision test is a little better. also fixed a mem leak and hopefully fixed a hang that can happen sometimes.