Tamito Kajiyama 2676f2d58f Merged changes in the trunk up to revision 42021. ...

Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c

2011-11-20 21:02:12 +00:00

..

__init__.py

addons in contrib now have their own 'Testing' category which is off by default.

2011-11-17 20:11:20 +00:00

properties_animviz.py

correct spelling errors in comments

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

properties_data_armature.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +00:00

properties_data_bone.py

correct spelling errors in comments

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

properties_data_camera.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +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 fix for recent Ocean Foam change, makes it a bit more compact.

2011-11-20 14:36:23 +00:00

properties_data_speaker.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +00:00

properties_game.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +00:00

properties_material.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +00:00

properties_object_constraint.py

Bugfix [#29264] Superfluous control in Maintain Volume constraint

2011-11-15 11:15:37 +00:00

properties_object.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +00:00

properties_particle.py

UI/RNA:

2011-11-20 00:32:39 +00:00

properties_physics_cloth.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +00:00

properties_physics_common.py

Merge with trunk r41197

2011-10-22 16:43:23 +00:00

properties_physics_dynamicpaint.py

minor cleanup

2011-11-16 16:38:37 +00:00

properties_physics_field.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +00:00

properties_physics_fluid.py

2.6 Physics UI Files:

2011-11-10 19:10:23 +00:00

properties_physics_smoke.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +00:00

properties_physics_softbody.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +00:00

properties_render.py

Added a new operator in the Parameter Editor mode to make a copy

2011-11-13 21:55:13 +00:00

properties_scene.py

UI/RNA:

2011-11-20 00:32:39 +00:00

properties_texture.py

pep8 edits

2011-11-13 14:38:00 +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

UI/RNA:

2011-11-20 00:32:39 +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

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +00:00

space_image.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +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

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +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

hide overly picky warnings from 'pylint' for pep8 script, indentation edits.

2011-11-19 16:17:35 +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

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +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

UI:

2011-11-19 20:57:53 +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 42021.

2011-11-20 21:02:12 +00:00