Tamito Kajiyama dd8e836067 Merged changes in the trunk up to revision 51853. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/operators/bmo_utils.c

This commit also includes a fix of a bug identified during the merge and committed in revision 51853.
Thanks Thomas (dingto) for the timely fix!

2012-11-04 02:22:56 +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

style cleanup: pep8

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

properties_data_bone.py

Fix #32964: IK constraint had a "Target" option, which actually is an internal

2012-10-24 22:36:06 +00:00

properties_data_camera.py

Camera: bring Title Safe display up to date, making it a Safe Areas option that

2012-10-25 13:31:45 +00:00

properties_data_curve.py

style cleanup

2012-08-17 18:36:20 +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

reneme volume_preservation -> use_volume_preserve

2012-10-24 11:44:32 +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

Fix #32964: IK constraint had a "Target" option, which actually is an internal

2012-10-24 22:36:06 +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

Additional UI tweaking: the Freestyle toggle of the Include section in the Layers

2012-10-29 23:17:07 +00:00

properties_render.py

Merged changes in the trunk up to revision 51853.

2012-11-04 02:22:56 +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

Motion Tracking; expose View All and Center to Current Frame to View menu of graph view

2012-10-09 10:33:24 +00:00

space_console.py

style cleanup: pep8

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

space_dopesheet.py

Making "Jump to Keyframes" operator (for Action/Graph Editors) more obvious

2012-10-15 03:52:27 +00:00

space_filebrowser.py

== file browser ==

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

space_graph.py

Making "Jump to Keyframes" operator (for Action/Graph Editors) more obvious

2012-10-15 03:52:27 +00:00

space_image.py

add some missing NULL checks, a few parts of the code used a pointer then checked it for NULL after.

2012-09-11 02:18:27 +00:00

space_info.py

no longer use 'check_existing' to see if we need to have a save popup, instead use 'exec' operator on a saved file and

2012-10-31 17:03:31 +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

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

enable rendering from the sequencer again. this was working since 2.4x and shouldn't have been disabled.

2012-10-24 03:27:11 +00:00

space_text.py

Render API: shader script node for custom shaders.

2012-11-03 14:32:26 +00:00

space_time.py

User Interface Scripts:

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

wrong definition of parameterlist

2012-10-27 13:41:04 +00:00

space_view3d_toolbar.py

Fix #32522: Object's diffuse color not showing in Sculpt Mode

2012-10-22 17:33:53 +00:00

space_view3d.py

Merged changes in the trunk up to revision 51853.

2012-11-04 02:22:56 +00:00