Tamito Kajiyama b7cd9ec3ad Merged changes in the trunk up to revision 52340. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

2012-11-19 00:41:11 +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

Fix #32219: Inconsistent influence of Units Scale on new objects

2012-10-19 12:53:03 +00:00

anim.py

style cleanup: pep8

2012-10-08 08:28:05 +00:00

clip.py

style cleanup: pep8

2012-10-08 08:28:05 +00:00

console.py

style cleanup: pep8

2012-10-08 08:28:05 +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 cleanup: pep8

2012-10-08 08:28:05 +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

Google Summer of Code project: "Smoke Simulator Improvements & Fire".

2012-10-10 13:18:07 +00:00

object_randomize_transform.py

Last spell checking (for now).

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

object.py

style cleanup: pep8

2012-10-08 08:28:05 +00:00

presets.py

typo in own recent commit.

2012-11-18 03:01:31 +00:00

screen_play_rendered_anim.py

fix for 'Playanim' playing past the last frame of an animation. also print -s and -e in help message.

2012-11-17 01:15:28 +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

remove ifdef'd bevel code, current bevel works better then the previous code.

2012-11-14 09:45:15 +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 [#33179] Can't delete centered edge loop if x-mirror is activated

2012-11-15 06:10:09 +00:00