Tamito Kajiyama 3b711a6ed0 Merged changes in the trunk up to revision 45133. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c

2012-03-25 08:20:19 +00:00

..

__init__.py

Merged changes in the trunk up to revision 41638.

2011-11-08 06:30:02 +00:00

add_mesh_torus.py

style cleanup: pep8, indentation

2012-03-24 07:36:32 +00:00

anim.py

Fixing several issues with keyingsets:

2012-03-08 14:04:06 +00:00

clip.py

last commit broke cycles, also add BMESH_TODO's for python scripts that need upgrading.

2012-03-23 00:56:22 +00:00

console.py

correct spelling errors in comments

2011-10-17 06:58:07 +00:00

freestyle.py

Fix for warnings about period at the end of description strings for

2011-10-30 09:05:47 +00:00

image.py

Fix #30436: Externally editing unsaved images fails

2012-03-06 21:54:33 +00:00

mesh.py

last commit broke cycles, also add BMESH_TODO's for python scripts that need upgrading.

2012-03-23 00:56:22 +00:00

object_align.py

fix for align objects with non mesh objects.

2011-10-07 20:53:54 +00:00

object_quick_effects.py

cmake & pep8 tidy up, also some style edits.

2011-11-08 01:32:34 +00:00

object_randomize_transform.py

pep8 edits

2012-01-01 08:52:54 +00:00

object.py

last commit broke cycles, also add BMESH_TODO's for python scripts that need upgrading.

2012-03-23 00:56:22 +00:00

presets.py

style cleanup: pep8, indentation

2012-03-24 07:36:32 +00:00

screen_play_rendered_anim.py

A big set of UI messages fixes and tweaks! No functional changes.

2011-10-20 07:56:04 +00:00

sequencer.py

Reverting poll changes of last commit.

2012-02-29 12:11:06 +00:00

uvcalc_follow_active.py

more face -> tessface edits

2012-03-23 01:10:41 +00:00

uvcalc_lightmap.py

svn merge ^/trunk/blender -r43934:43976

2012-02-08 05:45:16 +00:00

uvcalc_smart_project.py

Various fixes to UI messages (among other things, all messages needed it should now be capitalized).

2012-02-27 18:14:56 +00:00

vertexpaint_dirt.py

Minor UI messages fixes, and enabling i18n for all modifier_setError() error messages.

2012-03-17 14:27:46 +00:00

view3d.py

correct spelling errors in comments

2011-10-17 06:58:07 +00:00

wm.py

Various fixes to UI messages (among other things, all messages needed it should now be capitalized).

2012-02-27 18:14:56 +00:00