Tamito Kajiyama 0ec378f3fe Merged changes in the trunk up to revision 34193. ...

Conflicts resolved:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_channels.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

API changes resolved:
source/blender/freestyle/intern/system/PythonInterpreter.h

2011-01-09 15:07:14 +00:00

..

properties_animviz.py

ran through pep8 checker

2010-09-07 15:17:42 +00:00

properties_data_armature.py

revert part of Tons commit r33884.

2010-12-30 12:22:28 +00:00

properties_data_bone.py

pep8 cleanup

2011-01-01 07:20:34 +00:00

properties_data_camera.py

bugfix [#25240] Custom properties panel on pinned data fail.

2010-12-17 10:33:28 +00:00

properties_data_curve.py

pep8 cleanup

2011-01-01 07:20:34 +00:00

properties_data_empty.py

ran through pep8 checker

2010-09-07 15:17:42 +00:00

properties_data_lamp.py

bugfix [#25240] Custom properties panel on pinned data fail.

2010-12-17 10:33:28 +00:00

properties_data_lattice.py

bugfix [#25240] Custom properties panel on pinned data fail.

2010-12-17 10:33:28 +00:00

properties_data_mesh.py

Bugfix #25505

2011-01-06 09:55:20 +00:00

properties_data_metaball.py

revert part of Tons commit r33884.

2010-12-30 12:22:28 +00:00

properties_data_modifier.py

Fix for bug [#21534] Multires modifier strange deformations

2011-01-07 21:12:47 +00:00

properties_game.py

ran through pep8 checker

2010-09-07 15:17:42 +00:00

properties_material.py

bugfix [#25240] Custom properties panel on pinned data fail.

2010-12-17 10:33:28 +00:00

properties_object_constraint.py

Ported back import BVH as Empties, uses delta transformations.

2011-01-03 16:22:30 +00:00

properties_object.py

pep8 cleanup

2011-01-01 07:20:34 +00:00

properties_particle.py

New hair child options:

2011-01-07 11:24:34 +00:00

properties_physics_cloth.py

button to remove presets.

2010-09-14 04:58:25 +00:00

properties_physics_common.py

Pointcache code cleanup and disk cache compression options:

2011-01-02 06:52:47 +00:00

properties_physics_field.py

ran through pep8 checker

2010-09-07 15:17:42 +00:00

properties_physics_fluid.py

Hide "active" checkbox in ui for "fluid" type fluid objects as it's not used by fluidsim.

2010-11-12 14:54:40 +00:00

properties_physics_smoke.py

Fix for [#25001] Enable Smoke High Resolution is greyout after baking

2010-12-02 04:47:40 +00:00

properties_physics_softbody.py

ran through pep8 checker

2010-09-07 15:17:42 +00:00

properties_render.py

Merged changes in the trunk up to revision 34010.

2011-01-02 18:34:32 +00:00

properties_scene.py

pep8 cleanup

2011-01-01 07:20:34 +00:00

properties_texture.py

Revert bump mapping patch for now, backwards compatibility is not good enough,

2011-01-07 16:55:56 +00:00

properties_world.py

pep8 cleanup

2011-01-01 07:20:34 +00:00

space_console.py

move report/operator view out of the 'Console' into the 'Info' space (file menu).

2010-11-11 13:36:57 +00:00

space_dopesheet.py

Merged changes in the trunk up to revision 34193.

2011-01-09 15:07:14 +00:00

space_filebrowser.py

pep8 cleanup

2011-01-01 07:20:34 +00:00

space_graph.py

Added back "Marker" menu to all animation editors.

2011-01-06 04:47:57 +00:00

space_image.py

pep8 cleanup

2011-01-01 07:20:34 +00:00

space_info.py

pep8 cleanup

2011-01-01 07:20:34 +00:00

space_logic.py

ran through pep8 checker

2010-09-07 15:17:42 +00:00

space_nla.py

Added back "Marker" menu to all animation editors.

2011-01-06 04:47:57 +00:00

space_node.py

ran through pep8 checker

2010-09-07 15:17:42 +00:00

space_outliner.py

remove recently added rna function uilayout.prop_search_self() and instead allow collections to be coerced into rna structs when they define a type.

2010-08-24 03:02:27 +00:00

space_sequencer.py

Missed this file for markers commit... it already had a markers menu

2011-01-06 05:04:44 +00:00

space_text.py

rename and negate DISABLE_PYTHON --> WITH_PYTHON

2010-10-31 04:11:39 +00:00

space_time.py

Added back "Marker" menu to all animation editors.

2011-01-06 04:47:57 +00:00

space_userpref_keymap.py

pep8 cleanup

2011-01-01 07:20:34 +00:00

space_userpref.py

Merged changes in the trunk up to revision 34193.

2011-01-09 15:07:14 +00:00

space_view3d_toolbar.py

Grease Pencil Todos: "Sketching Sessions"

2011-01-04 03:14:01 +00:00

space_view3d.py

Todo item: brought transform texture space back.

2011-01-05 17:27:26 +00:00