Tamito Kajiyama c8deda3276 Merged changes in the trunk up to revision 35505. ...

Conflicts resolved:
source/blender/makesdna/DNA_material_types.h

2011-03-13 02:10:39 +00:00

..

properties_animviz.py

patch [#25809] Auto-Registration as utility function.

2011-02-10 23:48:22 +00:00

properties_data_armature.py

2.5 Armature Panel UI Script:

2011-03-04 19:57:05 +00:00

properties_data_bone.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

properties_data_camera.py

2.5 UI Interface Scripts:

2011-02-16 20:29:23 +00:00

properties_data_curve.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

properties_data_empty.py

2.5 UI Scripts:

2011-02-26 16:04:14 +00:00

properties_data_lamp.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

properties_data_lattice.py

2.5 UI Scripts:

2011-02-26 16:04:14 +00:00

properties_data_mesh.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

properties_data_metaball.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

properties_data_modifier.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

properties_game.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

properties_material.py

2011-03-11 07:59:43 +00:00

properties_object_constraint.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

properties_object.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

properties_particle.py

2.5 Fluid UI Python Script:

2011-03-12 15:24:16 +00:00

properties_physics_cloth.py

patch [#25809] Auto-Registration as utility function.

2011-02-10 23:48:22 +00:00

properties_physics_common.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

properties_physics_field.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

properties_physics_fluid.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

properties_physics_smoke.py

2.5 UI Scripts:

2011-02-26 16:04:14 +00:00

properties_physics_softbody.py

patch [#25809] Auto-Registration as utility function.

2011-02-10 23:48:22 +00:00

properties_render.py

Merged changes in the trunk up to revision 35505.

2011-03-13 02:10:39 +00:00

properties_scene.py

replace import *'s with named imports (using * is convenient for some scripts but considered bad practice by python devs)

2011-02-27 15:25:24 +00:00

properties_texture.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

properties_world.py

patch [#25809] Auto-Registration as utility function.

2011-02-10 23:48:22 +00:00

space_console.py

2.5 UI scripts:

2011-02-28 14:25:40 +00:00

space_dopesheet.py

Merged changes in the trunk up to revision 35505.

2011-03-13 02:10:39 +00:00

space_filebrowser.py

patch [#25809] Auto-Registration as utility function.

2011-02-10 23:48:22 +00:00

space_graph.py

Graph Editor part of the changes in the previous commit...

2011-02-14 02:50:52 +00:00

space_image.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

space_info.py

when checking for windows check sys.platform starts with "win" rather then '== "win32"' & avoid importing platform.

2011-03-11 01:24:16 +00:00

space_logic.py

pep8 cleanup and remove unused vars/imports

2011-02-17 04:35:41 +00:00

space_nla.py

bugfix [#26094] Going to Bone Roll menu brings up python error

2011-02-16 02:25:03 +00:00

space_node.py

2.5 UI scripts:

2011-02-28 14:25:40 +00:00

space_outliner.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

space_sequencer.py

use set's, since pythons 3.2's optimizer converts these to frozensets, lookups are also faster then tuples (though this isn't a bottleneck).

2011-03-07 13:23:45 +00:00

space_text.py

Another small text space usability: option to show right margin (aka print marign)

2011-02-18 13:57:54 +00:00

space_time.py

2.5 UI scripts:

2011-02-28 14:25:40 +00:00

space_userpref_keymap.py

Fix keymap operator polling functions to be a bit safer.

2011-03-07 23:53:08 +00:00

space_userpref.py

Merged changes in the trunk up to revision 35505.

2011-03-13 02:10:39 +00:00

space_view3d_toolbar.py

also enable edge-seam unwrapping when running the mark_seam operator.

2011-03-10 06:06:55 +00:00

space_view3d.py

revert r35438, Martin doesn't like having this option tacked on.

2011-03-10 00:38:23 +00:00