Tamito Kajiyama 4ea2fb8b0a Merged changes in the trunk up to revision 49478. ...

Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c

2012-08-02 00:10:05 +00:00

..

__init__.py

split out mask UI into their own classes.

2012-07-25 13:09:12 +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

style cleanup

2012-07-29 12:07:06 +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

Fix [#32163] vertex groups get wiped.

2012-07-23 12:27: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

style cleanup

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

properties_game.py

style cleanup

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

properties_mask_common.py

style cleanup

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

properties_material.py

User Interface Scripts:

2012-07-29 10:03:46 +00:00

properties_object_constraint.py

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

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

properties_object.py

User Interface Scripts:

2012-07-29 10:03:46 +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

User Interface Scripts:

2012-07-29 10:03:46 +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

User Interface Scripts:

2012-07-29 10:03:46 +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

Fix for Freestyle-related UI components showing up in the Render buttons when Cycles is selected.

2012-08-01 20:14:27 +00:00

properties_scene.py

style cleanup

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

properties_texture.py

style cleanup

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

properties_world.py

style cleanup

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

space_clip.py

style cleanup

2012-07-29 12:07:06 +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

misc mask fixes

2012-08-01 10:50:39 +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

make node select_all consistent with other select operators, also add Ctrl+I, select inverse to node space.

2012-08-01 13:28:19 +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-29 12:07:06 +00:00

space_text.py

style cleanup

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

space_time.py

User Interface Scripts:

2012-07-29 10:03:46 +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

style cleanup

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

space_view3d_toolbar.py

style cleanup

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

space_view3d.py

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00