Tamito Kajiyama 68ae82bb47 Merged changes in the trunk up to revision 43585. ...

Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c

2012-01-21 23:01:25 +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

- operator presets now work in the 3D view as well as the file selector.

2011-11-08 16:59:06 +00:00

anim.py

py scripts - replace bad uses of len(),

2012-01-02 16:18:39 +00:00

clip.py

pep8 edits, also remove unused vars

2012-01-17 17:57:20 +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

not all filepaths had the FILE_PATH subtype, this means using non utf8 paths would give errors.

2011-12-11 21:23:29 +00:00

mesh.py

Typo fix - thanks "Olson" on IRC!

2012-01-09 09:12:55 +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

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

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

presets.py

enable xml preset save/load, replace install/export themes with these.

2012-01-10 16:20:01 +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

picky edits - use "" for non enum strings.

2011-12-22 03:56:21 +00:00

uvcalc_follow_active.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +00:00

uvcalc_lightmap.py

Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface,

2011-11-23 17:25:25 +00:00

uvcalc_smart_project.py

picky edits - use "" for non enum strings.

2011-12-22 03:56:21 +00:00

vertexpaint_dirt.py

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

view3d.py

correct spelling errors in comments

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

wm.py

pep8 edits, also remove unused vars

2012-01-17 17:57:20 +00:00