Campbell Barton 40727d318d fix [#29380] VParent + Mask Mod, ...

line was out of sync with trunk

2011-11-26 20:48:18 +00:00

..

avi

correct indentation and some whitespace edits (no functional changes)

2011-11-11 13:09:14 +00:00

blenfont

replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX

2011-11-26 04:07:38 +00:00

blenkernel

fix [#29380] VParent + Mask Mod,

2011-11-26 20:48:18 +00:00

blenlib

svn merge ^/trunk/blender -r42139:42172

2011-11-26 16:29:14 +00:00

blenloader

svn merge ^/trunk/blender -r42139:42172

2011-11-26 16:29:14 +00:00

blenpluginapi

svn merge -r41287:41310 ^/trunk/blender note, mirror modifier had slow, per vertex name flipping, replaced with flip_map from trunk

2011-10-27 09:42:03 +00:00

bmesh

fix [#29079] New face added with "F" has wrong winding

2011-11-25 01:18:48 +00:00

collada

svn merge ^/trunk/blender -r42095:42116

2011-11-24 05:33:22 +00:00

editors

svn merge ^/trunk/blender -r42139:42172

2011-11-26 16:29:14 +00:00

gpu

fix [#29256] Import images as planes add on doesn't work correctly in bmesh

2011-11-24 22:40:43 +00:00

ikplugin

Fix #29041: parenting problem with tree IK for iTaSC and iksolver, where it

2011-11-13 13:08:15 +00:00

imbuf

replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX

2011-11-26 04:07:38 +00:00

makesdna

svn merge ^/trunk/blender -r42139:42172

2011-11-26 16:29:14 +00:00

makesrna

svn merge ^/trunk/blender -r42139:42172

2011-11-26 16:29:14 +00:00

modifiers

svn merge ^/trunk/blender -r42139:42172

2011-11-26 16:29:14 +00:00

nodes

minor edit - weight_to_rgb() and ramp_blend() now take a float vector rather than 3 float pointers.

2011-11-26 03:13:54 +00:00

python

minor bpy api edits

2011-11-26 15:18:30 +00:00

quicktime

rename image type defines to be less ambiguous, also set BMP as not supporting alpha (it reads but cant write)

2011-11-22 00:35:26 +00:00

render

svn merge ^/trunk/blender -r42139:42172

2011-11-26 16:29:14 +00:00

windowmanager

svn merge ^/trunk/blender -r42139:42172

2011-11-26 16:29:14 +00:00

CMakeLists.txt

svn merge -r41722:41723 ^/trunk/blender

2011-11-11 06:25:45 +00:00

SConscript

svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00