Tamito Kajiyama 065605e0da Merged changes in the trunk up to revision 48893. ...

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/RNA_enum_types.h

2012-07-13 23:23:06 +00:00

..

__init__.py

picky cleanup to use of bpy.types

2012-01-18 06:11:56 +00:00

properties_animviz.py

Motion Paths Gui - Restoring a "Calculate" button to the Motion Paths panel

2012-05-23 03:36:03 +00:00

properties_data_armature.py

More spell and typo fixes (mostly visualise->visualize, grey->gray, normalise->normalize).

2012-07-03 19:09:07 +00:00

properties_data_bone.py

style cleanup

2012-06-19 22:17:19 +00:00

properties_data_camera.py

Fisheye Camera for Cycles

2012-05-04 16:20:51 +00:00

properties_data_curve.py

Style edit (mostly), use """ for docstrings (not ''').

2012-07-03 09:02:41 +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

Python UI Files:

2012-05-01 11:09:05 +00:00

properties_data_lattice.py

Fixing issues with i18n stuff:

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

properties_data_mesh.py

Minor interface change: space between vertex group specials menu and up/down buttons

2012-07-11 10:41:26 +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

style cleanup

2012-07-04 21:41:05 +00:00

properties_data_speaker.py

pep/style edits & quiet some warnings

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

properties_game.py

style cleanup

2012-07-04 21:41:05 +00:00

properties_material.py

Finish changes in up/down arrows for menus

2012-05-23 14:24:40 +00:00

properties_object_constraint.py

"Fix" for [#30704] Action Constraint mapping bug

2012-06-12 06:22:23 +00:00

properties_object.py

style cleanup

2012-07-04 21:41:05 +00:00

properties_paint_common.py

Code/UI cleanup: improvements for sculpt brush texture settings.

2012-05-15 04:50:47 +00:00

properties_particle.py

style cleanup

2012-07-04 21:41:05 +00:00

properties_physics_cloth.py

Don't show physics properties in game engine conext

2012-06-08 15:24:28 +00:00

properties_physics_common.py

Point Cache: allow baking external smoke caches. This needs to be cleaned up

2012-04-28 09:00:11 +00:00

properties_physics_dynamicpaint.py

Don't show physics properties in game engine conext

2012-06-08 15:24:28 +00:00

properties_physics_field.py

First load of spell and typo fixes (mostly UI messages, but also one or two pieces of code using mis-spelled names).

2012-07-03 17:20:21 +00:00

properties_physics_fluid.py

Last spell checking (for now).

2012-07-04 15:52:07 +00:00

properties_physics_smoke.py

Don't show physics properties in game engine conext

2012-06-08 15:24:28 +00:00

properties_physics_softbody.py

Don't show physics properties in game engine conext

2012-06-08 15:24:28 +00:00

properties_render.py

Merged changes in the trunk up to revision 48227.

2012-06-24 10:29:26 +00:00

properties_scene.py

style cleanup

2012-06-19 22:17:19 +00:00

properties_texture.py

Fix [#31714] Pinning object context causes texture list to disappear

2012-06-21 07:32:06 +00:00

properties_world.py

2.6 UI:

2012-03-10 20:30:05 +00:00

space_clip.py

Clip editor mode selection: show menu with modes on TAB

2012-07-12 12:06:40 +00:00

space_console.py

style cleanup

2012-07-04 21:41:05 +00:00

space_dopesheet.py

Restoring Group Colours for Animation Channels - Part 1

2012-05-24 01:25:31 +00:00

space_filebrowser.py

RNA:

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

space_graph.py

Restoring Group Colours for Animation Channels - Part 1

2012-05-24 01:25:31 +00:00

space_image.py

style cleanup

2012-07-04 21:41:05 +00:00

space_info.py

Readme and Release Log Links:

2012-07-11 21:57:11 +00:00

space_logic.py

Fix #30132: "Add Game Property" works incorrect after "Add Text Game Property"

2012-02-12 10:23:06 +00:00

space_nla.py

replace relative imports with absolute imports so scritps can be executed directly (live editing).

2012-04-04 14:39:52 +00:00

space_node.py

Two pass execution:

2012-07-04 11:39:28 +00:00

space_outliner.py

Fixing issues with i18n stuff:

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

space_sequencer.py

style cleanup

2012-07-04 21:41:05 +00:00

space_text.py

style cleanup: pep8

2012-05-15 18:50:51 +00:00

space_time.py

style cleanup: pep8

2012-05-15 18:50:51 +00:00

space_userpref_keymap.py

fix [#31712] User prefs Input: Filter searches for names starting with entered phrase only

2012-06-10 21:38:24 +00:00

space_userpref.py

UI translation from inside Blender UI: first part.

2012-07-09 14:25:35 +00:00

space_view3d_toolbar.py

add back blending for vertex and weight paint modes, you may want to keep the one brush and switch blending options.

2012-06-20 09:34:26 +00:00

space_view3d.py

Merged changes in the trunk up to revision 48893.

2012-07-13 23:23:06 +00:00