Campbell Barton 7495757553 svn merge -r39890:39889 source/blender/editors/object/object_relations.c source/blender/editors/object/object_hook.c ...

This change has been reverted in trunk so reverse merging the merge.

2011-09-06 01:23:43 +00:00

..

avi

replace octal 0177 with 127 to be more clear, no functional change.

2011-08-27 03:34:11 +00:00

blenfont

fix [#28430] Image with Stampinfo does not get saved correctly with alpha

2011-08-31 01:05:40 +00:00

blenkernel

svn merge -r39878:39890 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-03 12:57:33 +00:00

blenlib

svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-03 02:49:21 +00:00

blenloader

svn merge -r39878:39890 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-03 12:57:33 +00:00

blenpluginapi

svn merge -r39792:39829 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-01 00:56:21 +00:00

bmesh

Patch 28495 from Andrew Wiggin (ender79) to fix bug 28494 - make edge and ring walkers more like trunk behavior for rmb select with non-manifold edges.

2011-09-04 18:36:27 +00:00

collada

COLLADA: Take parent bone length and direction instead of using bone pointing up with length 1. Looks much nicer and less confusing on larger armatures now.

2011-08-31 09:37:14 +00:00

editors

svn merge -r39890:39889 source/blender/editors/object/object_relations.c source/blender/editors/object/object_hook.c

2011-09-06 01:23:43 +00:00

gpu

svn merge -r39792:39829 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-01 00:56:21 +00:00

ikplugin

cmake: cleanup include paths, some duplicates and going up some unneeded dirs.

2011-07-17 09:11:13 +00:00

imbuf

spaces -> tabs (configure you're editors right!)

2011-09-01 01:48:50 +00:00

makesdna

svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender, merge pepper, manually merged source/blender/editors/transform/transform_generics.c

2011-09-01 00:35:30 +00:00

makesrna

svn merge -r39878:39890 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-03 12:57:33 +00:00

modifiers

brought back some unused variables removed from previous commit, commented out, in case need their values later

2011-08-28 21:20:10 +00:00

nodes

Fix #28154: linux3-config.py doesn't exist

2011-08-21 13:31:46 +00:00

python

svn merge -r39878:39890 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-03 12:57:33 +00:00

quicktime

cmake: cleanup include paths, some duplicates and going up some unneeded dirs.

2011-07-17 09:11:13 +00:00

render

svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-03 02:49:21 +00:00

windowmanager

svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-03 02:49:21 +00:00

CMakeLists.txt

svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender, merge pepper, manually merged source/blender/editors/transform/transform_generics.c

2011-09-01 00:35:30 +00:00

SConscript

svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-12 05:35:19 +00:00