svn merge ^/trunk/blender -r43092:43092
authorCampbell Barton <ideasman42@gmail.com>
Wed, 4 Jan 2012 06:20:10 +0000 (06:20 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 4 Jan 2012 06:20:10 +0000 (06:20 +0000)
commitd0cdefd9fa37bf6788dad27b87d8d569c58ad94a
tree8807f7717662ad96cf6ad1d8df0a5caa12162361
parent8d8403c15ec8694d7d71d8a9f4a9e3a1fade666e
parent434c1e6df82a082fe03034a3ad3825f7b50ea533
svn merge ^/trunk/blender -r43092:43092
15 files changed:
doc/python_api/rst/info_best_practice.rst
doc/python_api/rst/info_quickstart.rst
doc/python_api/rst/info_tips_and_tricks.rst
release/scripts/startup/bl_ui/properties_object_constraint.py
source/blender/blenfont/intern/blf.c
source/blender/blenfont/intern/blf_glyph.c
source/blender/blenkernel/intern/object.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_util.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/modifiers/intern/MOD_wave.c
source/blender/python/mathutils/mathutils_Vector.c
source/blender/render/intern/source/render_texture.c