git.blender.org - blender-staging.git/commit

projects / blender-staging.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 75a227e c1a2851)

author	Ton Roosendaal <ton@blender.org>
	Mon, 19 Dec 2005 18:56:08 +0000 (18:56 +0000)
committer	Ton Roosendaal <ton@blender.org>
	Mon, 19 Dec 2005 18:56:08 +0000 (18:56 +0000)
commit	72d805f17d5e7732cf37c70c1ae732efd5d509c2
tree	69640121e30ca61b5c120a146c8f397a17839ae8	tree \| snapshot
parent	75a227e62009d8fb29f5bd7984ce82dcc4e68797	commit \| diff
parent	c1a2851c0d791f3e041ec6d33747cd056919b6ad	commit \| diff

Orange: monday merger with bf-blender (loadsa bugfixes).

ALso: a bit tidying up in editaction.c and python Object.c

15 files changed:

source/blender/blenkernel/intern/DerivedMesh.c	diff1 \|	diff2 \|	blob \| history
source/blender/include/BIF_resources.h	diff1 \|	diff2 \|	blob \| history
source/blender/python/api2_2x/Object.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/rendercore.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/texture.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/drawobject.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/editaction.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/editconstraint.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/editmesh.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/header_info.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/header_view3d.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/outliner.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/transform_conversions.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/transform_generics.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/transform_manipulator.c	diff1 \|	diff2 \|	blob \| history

Repository to test new patches