Tamito Kajiyama d433cd65f7 Merged changes in the trunk up to revision 53146. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c

2012-12-19 01:49:58 +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

A big cleaning patch by Bastien Montagne (thanks a lot!)

2012-12-11 22:00:22 +00:00

image.py

make cppcheck run with quiet flag when QUIET env var is set, make bpy.ops.image.project_apply() only use local images.

2012-12-09 14:17:33 +00:00

mesh.py

style cleanup: pep8

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

node.py

style cleanup: also change node selection method not to compare nodes a lot.

2012-12-12 15:41:15 +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

Bugfix [#29110] Animated Transforms to Deltas behaves oddly when applied more

2012-11-20 01:26:42 +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

fix [#33332] UV follow active quads

2012-11-29 14:02:28 +00:00

uvcalc_lightmap.py

typo's and some style cleanup, also added asserts into BLI_vsnprintf and BLI_sprintfN when invalid args are given.

2012-11-28 06:43:04 +00:00

uvcalc_smart_project.py

typo's and some style cleanup, also added asserts into BLI_vsnprintf and BLI_sprintfN when invalid args are given.

2012-11-28 06:43:04 +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

Better tooltip for "Install Theme..."

2012-12-15 16:27:12 +00:00