Tamito Kajiyama cdbfd1db38 Merged changes in the trunk up to revision 45820. ...

Conflicts resolved:
source/creator/creator.c

2012-04-21 00:33:36 +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

Fixing several issues with keyingsets:

2012-03-08 14:04:06 +00:00

clip.py

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

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

console.py

code cleanup: minor edits, use function for getting console module.

2012-04-15 14:51:37 +00:00

freestyle.py

Fix for warnings about period at the end of description strings for

2011-10-30 09:05:47 +00:00

image.py

avoid confusion with image 'Edit Externally' operator, disallow editing of packed images, resolves bug [#30506].

2012-04-03 12:02:32 +00:00

mesh.py

style cleanup: pep8, also quiet compiler warning.

2012-04-20 18:50:18 +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

Move "From Cursor" operator which sets dupli group offset to own operator

2012-04-13 12:14:20 +00:00

presets.py

style cleanup: pep8, also quiet compiler warning.

2012-04-20 18:50:18 +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

bmesh todo: vertex dirtmap now working again.

2012-04-13 08:41:30 +00:00

uvcalc_lightmap.py

Partial revert of rev45691: allow lightmap undo and add comment why redo was disabled

2012-04-16 14:27:22 +00:00

uvcalc_smart_project.py

bmesh todo: vertex dirtmap now working again.

2012-04-13 08:41:30 +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

rename wm.blenderplayer_start label from 'Start' to 'Start Game In Player', also made it check if the player is found before running.

2012-04-16 02:28:18 +00:00