Tamito Kajiyama 556912792a Merged changes in the trunk up to revision 54110. ...

Conflicts resolved:
source/blender/blenfont/SConscript
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_scene.c

2013-01-26 23:49:13 +00:00

..

__init__.py

Merged changes in the trunk up to revision 54110.

2013-01-26 23:49:13 +00:00

add_mesh_torus.py

changes needed for EDL import to work again.

2013-01-02 16:15:45 +00:00

anim.py

Fix [#33424] Inadequate bake action.

2012-12-28 13:34:19 +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

2013-01-15 23:15:32 +00:00

object_align.py

code cleanup: dont use 'bpy.context' when 'context' is available

2013-01-23 07:52:31 +00:00

object_quick_effects.py

code cleanup: dont use 'bpy.context' when 'context' is available

2013-01-23 07:52:31 +00:00

object_randomize_transform.py

code cleanup: dont use 'bpy.context' when 'context' is available

2013-01-23 07:52:31 +00:00

object.py

style cleanup

2013-01-15 23:15:32 +00:00

presets.py

style cleanup

2013-01-15 23:15:32 +00:00

rigidbody.py

rigidbody: Improve add/remove operators

2013-01-25 06:26:38 +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

style cleanup

2013-01-15 23:15:32 +00:00

uvcalc_lightmap.py

code cleanup: dont use 'bpy.context' when 'context' is available

2013-01-23 07:52:31 +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

fix [#33715] Dirty Vertex Colors display problem since 2.65a

2013-01-03 07:01:41 +00:00

view3d.py

don't constrain single edge extrude, annoying for retopo

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

wm.py

code cleanup: dont use 'bpy.context' when 'context' is available

2013-01-23 07:52:31 +00:00