Tamito Kajiyama e91f33101f Merged changes in the trunk up to revision 50956. ...

Conflicts resolved:
source/blender/editors/interface/resources.c

2012-09-30 13:16:55 +00:00

..

__init__.py

Merged changes in the trunk up to revision 49797.

2012-08-12 00:09:57 +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

Camera tracking presets

2012-08-04 10:47:31 +00:00

console.py

copy as script operator for the console, so you can copy input from a console for use in a textblock.

2012-08-19 21:32:18 +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

node.py

pep8 cleanup

2012-09-26 21:19:51 +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 #32372: Blender Locks up when using Quick Fluid feature

2012-09-03 16:08:28 +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

Camera tracking presets

2012-08-04 10:47:31 +00:00

screen_play_rendered_anim.py

fix [#32350] F11 play animation crash when UI language is not "Default"

2012-09-12 08:06:06 +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

modifications needed to get a URL from an RNA id from the testing script

2012-09-13 00:26:01 +00:00