Tamito Kajiyama 53840c7db5 Merged changes in the trunk up to revision 52546. ...

Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/idcode.c

2012-11-26 02:32:34 +00:00

..

__init__.py

Improvements of Freestyle GUI controls - Part 1.

2012-10-28 16:09:51 +00:00

properties_animviz.py

Bugfix [#32754] Clear Motion paths button not available on Motion paths panel

2012-10-04 11:05:48 +00:00

properties_data_armature.py

IK Solver:

2012-11-24 00:18:34 +00:00

properties_data_bone.py

IK Solver:

2012-11-24 00:18:34 +00:00

properties_data_camera.py

camera sensor ui fix: grey out values when not affecting camera

2012-11-21 19:08:27 +00:00

properties_data_curve.py

Added Map Taper option which if enabled maps affect of taper object on

2012-11-08 08:16:44 +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

Removing BLENDER_GAME from the COMPAT_ENGINES set for the sun lamp's Sky & Atmosphere panel since it isn't supported in the BGE.

2012-10-30 01:59:15 +00:00

properties_data_lattice.py

Fixing issues with i18n stuff:

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

properties_data_mesh.py

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +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

Triangulate modifier

2012-11-19 20:40:08 +00:00

properties_data_speaker.py

style cleanup

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

properties_game.py

BGE: Adding support for Bullet's collision masks. Each object now has a collision mask and a collision group. Object A and object B collide if object A's groups is in object B's mask and object B's group is in object A's mask. In other words, the group defines what the object is (collision wise) and the group defines what the object can collide with.

2012-10-30 15:44:16 +00:00

properties_mask_common.py

Alternate mask spline feather offset calculation method: now there are 2 [Even | Smooth]

2012-08-27 09:44:56 +00:00

properties_material.py

Render: local light group option for materials, blender internal feature from

2012-10-17 13:32:43 +00:00

properties_object_constraint.py

IK Solver:

2012-11-24 00:18:34 +00:00

properties_object.py

style cleanup: pep8

2012-10-08 08:28: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

Google Summer of Code project: "Smoke Simulator Improvements & Fire".

2012-10-10 13:18:07 +00:00

properties_physics_cloth.py

Google Summer of Code project: "Smoke Simulator Improvements & Fire".

2012-10-10 13:18:07 +00:00

properties_physics_common.py

Bugfix 30974

2012-10-23 14:07:32 +00:00

properties_physics_dynamicpaint.py

Google Summer of Code project: "Smoke Simulator Improvements & Fire".

2012-10-10 13:18:07 +00:00

properties_physics_field.py

Google Summer of Code project: "Smoke Simulator Improvements & Fire".

2012-10-10 13:18:07 +00:00

properties_physics_fluid.py

Last spell checking (for now).

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

properties_physics_smoke.py

Google Summer of Code project: "Smoke Simulator Improvements & Fire".

2012-10-10 13:18:07 +00:00

properties_physics_softbody.py

Google Summer of Code project: "Smoke Simulator Improvements & Fire".

2012-10-10 13:18:07 +00:00

properties_render_layer.py

Fix for dashed line options not working as expected in some applications

2012-11-04 23:52:26 +00:00

properties_render.py

Merged changes in the trunk up to revision 51985.

2012-11-07 22:12:19 +00:00

properties_scene.py

Color Management: move "Color Unpremultiply" option to Color Management panel

2012-09-27 12:44:52 +00:00

properties_texture.py

Texture UI:

2012-10-21 11:04:04 +00:00

properties_world.py

style cleanup

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

space_clip.py

Camera Tracking: allow fallback to reprojection resection by user demand

2012-11-05 08:04:27 +00:00

space_console.py

style cleanup: pep8

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

space_dopesheet.py

Bugfix [#33154] Toggle/Enable/Disable channel settings operators in

2012-11-20 02:03:20 +00:00

space_filebrowser.py

== file browser ==

2012-10-27 18:31:52 +00:00

space_graph.py

Bugfix [#33154] Toggle/Enable/Disable channel settings operators in

2012-11-20 02:03:20 +00:00

space_image.py

Added 'remove doubles' tool to uv editor.

2012-11-13 18:29:29 +00:00

space_info.py

Readme and Release Log Links:

2012-11-20 01:55:22 +00:00

space_logic.py

Editors UI:

2012-11-04 18:26:30 +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

Node UI:

2012-11-04 00:46:26 +00:00

space_outliner.py

Fixing issues with i18n stuff:

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

space_sequencer.py

Fix #33253: VSE preview doesn't display compositor

2012-11-21 09:36:36 +00:00

space_text.py

Text Editor: remove text marker functionality. Patch [#33251]

2012-11-23 14:33:14 +00:00

space_time.py

Editors UI:

2012-11-04 18:26:30 +00:00

space_userpref_keymap.py

Fix for #29056: NDOF motion events not configurable in user preferences.

2012-10-31 11:31:25 +00:00

space_userpref.py

remove USER_DISABLE_AA/use_antialiasing, this wasn't available from the UI but would be confusing if someone had it set from an old file.

2012-11-24 00:59:10 +00:00

space_view3d_toolbar.py

rename template_color_wheel() to template_color_picker()

2012-11-09 11:03:53 +00:00

space_view3d.py

Merged changes in the trunk up to revision 52546.

2012-11-26 02:32:34 +00:00