Tamito Kajiyama 15ed834343 Merged changes in the trunk up to revision 51718. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_scene.c
release/datafiles/startup.blend

2012-10-29 01:09:12 +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

style cleanup

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

Accidentally did a commit when I wanted to revert... (ignore my last revision)

2012-08-08 01:29:20 +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

Improvements of Freestyle GUI controls - Part 1.

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

properties_render.py

Improvements of Freestyle GUI controls - Part 1.

2012-10-28 16:09:51 +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

Clean up in "add object" code:

2012-10-05 12:59:09 +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

Python node operator for combined node collapsing and hiding unused sockets. Socket hide flag is added to RNA as well, but can only be set when the socket is not connected, to avoid dangling links in editor drawing. Currently this operator has no default hotkey, but can be called from the Node menu.

2012-08-14 17:56:33 +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

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

style cleanup: pep8

2012-10-08 08:28:05 +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 51718.

2012-10-29 01:09:12 +00:00