Tamito Kajiyama 329b05dcd7 Merged changes in the trunk up to revision 47381. ...

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

2012-06-03 21:11:10 +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

code cleanup: remove unused imports/defines + other redundant code.

2012-04-08 13:11:25 +00:00

anim.py

initialize bake action vars from context

2012-05-26 00:46:12 +00:00

clip.py

code cleanup: remove unused imports/defines + other redundant code.

2012-04-08 13:11:25 +00:00

console.py

workaround for python3.3 alpha with the console.

2012-05-17 15:24:26 +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 cleanup: pep8

2012-05-15 18:50:51 +00:00

mesh.py

rename Mesh.uv_loop_layers --> uv_layers

2012-04-22 23:51:50 +00:00

object_align.py

fix for align objects with non mesh objects.

2011-10-07 20:53:54 +00:00

object_quick_effects.py

cmake & pep8 tidy up, also some style edits.

2011-11-08 01:32:34 +00:00

object_randomize_transform.py

some pedantic load time speedup by not loading modules (math and subprocess in this case)

2012-04-06 08:04:31 +00:00

object.py

Fix #31633: select pattern operator did not mention [abc] wildcard, also

2012-05-29 17:01:24 +00:00

presets.py

A number of new features for the node editor in general and the Frame node in particular.

2012-05-22 14:13:33 +00:00

screen_play_rendered_anim.py

A big set of UI messages fixes and tweaks! No functional changes.

2011-10-20 07:56:04 +00:00

sequencer.py

Reverting poll changes of last commit.

2012-02-29 12:11:06 +00:00

uvcalc_follow_active.py

rename Mesh.uv_loop_layers --> uv_layers

2012-04-22 23:51:50 +00:00

uvcalc_lightmap.py

fix [#31181] Lightmap UV unwrap still broken

2012-04-30 05:45:01 +00:00

uvcalc_smart_project.py

rename Mesh.uv_loop_layers --> uv_layers

2012-04-22 23:51:50 +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

use fnmatch for reference globing rather then regex - regex overly complicates simple cases and wasnt being taken advantage of.

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