Tamito Kajiyama 4ea2fb8b0a Merged changes in the trunk up to revision 49478. ...

Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c

2012-08-02 00:10:05 +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 edit (mostly), use """ for docstrings (not ''').

2012-07-03 09:02:41 +00:00

anim.py

style cleanup

2012-06-19 22:17:19 +00:00

clip.py

Fix for [#32016] Tracking Settings Presets not working

2012-07-04 23:00:49 +00:00

console.py

style cleanup

2012-06-19 22:17:19 +00:00

freestyle.py

Added operators for adding the data paths to Freestyle edge/face mark properties of

2012-04-22 00:59:27 +00:00

image.py

Style edit (mostly), use """ for docstrings (not ''').

2012-07-03 09:02:41 +00:00

mesh.py

Style edit (mostly), use """ for docstrings (not ''').

2012-07-03 09:02:41 +00:00

object_align.py

Style edit (mostly), use """ for docstrings (not ''').

2012-07-03 09:02:41 +00:00

object_quick_effects.py

Fix part 1 of [#31840] Quick Explode Bugs related to it's fade option.

2012-06-19 16:45:48 +00:00

object_randomize_transform.py

Last spell checking (for now).

2012-07-04 15:52:07 +00:00

object.py

Style edit (mostly), use """ for docstrings (not ''').

2012-07-03 09:02:41 +00:00

presets.py

Fix for [#32016] Tracking Settings Presets not working

2012-07-04 23:00:49 +00:00

screen_play_rendered_anim.py

Style edit (mostly), use """ for docstrings (not ''').

2012-07-03 09:02:41 +00:00

sequencer.py

Style edit (mostly), use """ for docstrings (not ''').

2012-07-03 09:02:41 +00:00

uvcalc_follow_active.py

Last spell checking (for now).

2012-07-04 15:52:07 +00:00

uvcalc_lightmap.py

Last spell checking (for now).

2012-07-04 15:52:07 +00:00

uvcalc_smart_project.py

style cleanup

2012-07-04 21:41:05 +00:00

vertexpaint_dirt.py

bmesh todo: vertex dirtmap now working again.

2012-04-13 08:41:30 +00:00

view3d.py

don't constrain single edge extrude, annoying for retopo

2012-04-14 05:09:23 +00:00

wm.py

Fix #32165: context_set_value didn't make an undo push when changing scene settings

2012-07-24 15:51:26 +00:00