Tamito Kajiyama 80e398e7b2 Merged changes in the trunk up to revision 41638. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

2011-11-08 06:30:02 +00:00

..

__init__.py

Camera tracking integration

2011-11-07 12:55:18 +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

cmake & pep8 tidy up, also some style edits.

2011-11-08 01:32:34 +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

cmake & pep8 tidy up, also some style edits.

2011-11-08 01:32:34 +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

cmake & pep8 tidy up, also some style edits.

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

properties_material.py

cmake & pep8 tidy up, also some style edits.

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

properties_object_constraint.py

2.6 UI:

2011-11-07 14:34:56 +00:00

properties_object.py

cmake & pep8 tidy up, also some style edits.

2011-11-08 01:32:34 +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

cmake & pep8 tidy up, also some style edits.

2011-11-08 01:32:34 +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

cmake & pep8 tidy up, also some style edits.

2011-11-08 01:32:34 +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

Merged changes in the trunk up to revision 41638.

2011-11-08 06:30:02 +00:00

properties_scene.py

2.6 UI:

2011-11-07 14:34:56 +00:00

properties_texture.py

correct spelling errors in comments

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

properties_world.py

Related to #29092: make the working of the Mist Intensity option more clear in

2011-11-02 12:18:51 +00:00

space_clip.py

cmake & pep8 tidy up, also some style edits.

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

space_console.py

2.6 Python UI files:

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

space_dopesheet.py

patch [#27917] MARKER MENUS: Unification and adding "Duplicate Marker to Scene..."

2011-11-03 12:47:39 +00:00

space_filebrowser.py

RNA:

2011-11-07 16:26:53 +00:00

space_graph.py

patch [#27917] MARKER MENUS: Unification and adding "Duplicate Marker to Scene..."

2011-11-03 12:47:39 +00:00

space_image.py

cmake & pep8 tidy up, also some style edits.

2011-11-08 01:32:34 +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

patch [#27917] MARKER MENUS: Unification and adding "Duplicate Marker to Scene..."

2011-11-03 12:47:39 +00:00

space_node.py

RenderEngine/Nodes: system to check for shading nodes compatibility

2011-11-02 19:24:30 +00:00

space_outliner.py

Fixing issues with i18n stuff:

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

space_sequencer.py

patch [#27917] MARKER MENUS: Unification and adding "Duplicate Marker to Scene..."

2011-11-03 12:47:39 +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

Camera tracking integration

2011-11-07 12:55:18 +00:00

space_userpref_keymap.py

cmake & pep8 tidy up, also some style edits.

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

space_userpref.py

cmake & pep8 tidy up, also some style edits.

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

space_view3d_toolbar.py

cmake & pep8 tidy up, also some style edits.

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

space_view3d.py

Merged changes in the trunk up to revision 41638.

2011-11-08 06:30:02 +00:00