Tamito Kajiyama 65668dc5eb Merged changes in the trunk up to revision 41368. ...

Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c

2011-10-30 02:03:40 +00:00

..

__init__.py

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

properties_animviz.py

correct spelling errors in comments

2011-10-17 06:58:07 +00:00

properties_data_armature.py

correct spelling errors in comments

2011-10-17 06:58:07 +00:00

properties_data_bone.py

correct spelling errors in comments

2011-10-17 06:58:07 +00:00

properties_data_camera.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

properties_data_curve.py

radius interpolation was incorrectly greyed out for 2D curves.

2011-10-13 06:07:11 +00:00

properties_data_empty.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

properties_data_lamp.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

properties_data_lattice.py

Fixing issues with i18n stuff:

2011-09-15 13:20:18 +00:00

properties_data_mesh.py

rename user interface operator properties from 'op' to 'props'

2011-10-23 00:53:50 +00:00

properties_data_metaball.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

properties_data_modifier.py

UI tweak: user texture datablock chooser for fields and warp modifier,

2011-10-20 14:58:53 +00:00

properties_data_speaker.py

fix for misc py errors + some pep8 edits.

2011-09-08 05:42:44 +00:00

properties_game.py

correct operator name from my own recent changes and edit navmesh rna prop name for consistency

2011-10-10 10:24:26 +00:00

properties_material.py

correct spelling errors in comments

2011-10-17 06:58:07 +00:00

properties_object_constraint.py

correct spelling errors in comments

2011-10-17 06:58:07 +00:00

properties_object.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

properties_particle.py

Merged changes in the trunk up to revision 41368.

2011-10-30 02:03:40 +00:00

properties_physics_cloth.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

properties_physics_common.py

correct spelling errors in comments

2011-10-17 06:58:07 +00:00

properties_physics_field.py

UI tweak: user texture datablock chooser for fields and warp modifier,

2011-10-20 14:58:53 +00:00

properties_physics_fluid.py

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

properties_physics_smoke.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

properties_physics_softbody.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

properties_render.py

Extended the set of conditions for feature edge selection by edge types.

2011-10-27 20:57:14 +00:00

properties_scene.py

rename user interface operator properties from 'op' to 'props'

2011-10-23 00:53:50 +00:00

properties_texture.py

correct spelling errors in comments

2011-10-17 06:58:07 +00:00

properties_world.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

space_console.py

2.6 Python UI files:

2011-09-22 19:50:41 +00:00

space_dopesheet.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

space_filebrowser.py

import common classes from bpy.types, saves ~1000 python getattrs on startup.

2011-08-12 06:57:00 +00:00

space_graph.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

space_image.py

rename user interface operator properties from 'op' to 'props'

2011-10-23 00:53:50 +00:00

space_info.py

* Updating readme.html and link to release logs for 2.60, now that we approach the RC state.

2011-10-01 11:21:47 +00:00

space_logic.py

correct spelling errors in comments

2011-10-17 06:58:07 +00:00

space_nla.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

space_node.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

space_outliner.py

Fixing issues with i18n stuff:

2011-09-15 13:20:18 +00:00

space_sequencer.py

Fixes for #26837: MPEG Preseek does not work for some h264 files.

2011-10-12 12:49:45 +00:00

space_text.py

pep8 cleanup and fix for keymap test operator from my own recent fix.

2011-09-26 15:39:15 +00:00

space_time.py

remove use of gettext: _("...") style translation now its handled by rna.

2011-09-21 15:18:38 +00:00

space_userpref_keymap.py

rename user interface operator properties from 'op' to 'props'

2011-10-23 00:53:50 +00:00

space_userpref.py

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

space_view3d_toolbar.py

correct spelling errors in comments

2011-10-17 06:58:07 +00:00

space_view3d.py

Merged changes in the trunk up to revision 41225.

2011-10-29 15:46:14 +00:00