Tamito Kajiyama 556912792a Merged changes in the trunk up to revision 54110. ...

Conflicts resolved:
source/blender/blenfont/SConscript
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_scene.c

2013-01-26 23:49:13 +00:00

..

__init__.py

Merged changes in the trunk up to revision 54110.

2013-01-26 23:49:13 +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

This commit frees list ui items from their dependencies to Panel, and hence from all the limitations this implied (mostly, the "only one list per panel" one).

2012-12-28 09:20:16 +00:00

properties_data_bone.py

rename rna prop _parenting -> _parent

2012-12-21 12:17:30 +00:00

properties_data_camera.py

Some minor cleanup in camera's FOV angle props (mostly use DEG2RAD macro, and remove reference to degrees in tips - user is free to use radians if he prefers!).

2012-12-31 14:52:55 +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

…

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

…

properties_data_mesh.py

style cleanup

2013-01-15 23:15:32 +00:00

properties_data_metaball.py

…

properties_data_modifier.py

add 'deform - integrate' option to mesh-cache,

2013-01-24 04:02:30 +00:00

properties_data_speaker.py

style cleanup

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

properties_game.py

style cleanup

2013-01-15 23:15:32 +00:00

properties_mask_common.py

style cleanup

2013-01-15 23:15:32 +00:00

properties_material.py

remove type checks on drawing uiList's,

2012-12-28 10:45:59 +00:00

properties_object_constraint.py

style cleanup

2013-01-15 23:15:32 +00:00

properties_object.py

move draw all edges into the object settings (object panel), makes more sense here since its next to draw extra wire

2013-01-18 19:01:26 +00:00

properties_paint_common.py

Unification of brush code

2013-01-16 12:57:35 +00:00

properties_particle.py

This commit frees list ui items from their dependencies to Panel, and hence from all the limitations this implied (mostly, the "only one list per panel" one).

2012-12-28 09:20:16 +00:00

properties_physics_cloth.py

Fix part of #33469: cloth preroll had a wrong tooltip and low limit of 200 frames.

2012-12-18 15:44:04 +00:00

properties_physics_common.py

rigidbody: Fix constraint buttons only showing for mesh objects

2013-01-23 13:45:52 +00:00

properties_physics_dynamicpaint.py

style cleanup

2013-01-15 23:15:32 +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_rigidbody_constraint.py

UI / Layout scripts:

2013-01-23 11:40:35 +00:00

properties_physics_rigidbody.py

UI / Layout scripts:

2013-01-23 11:40:35 +00:00

properties_physics_smoke.py

style cleanup

2013-01-15 23:15:32 +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

Merged changes in the trunk up to revision 53584.

2013-01-05 22:24:05 +00:00

properties_render.py

Merged changes in the trunk up to revision 54110.

2013-01-26 23:49:13 +00:00

properties_scene.py

UI / Layout scripts:

2013-01-23 11:40:35 +00:00

properties_texture.py

Game Engine UI: Image Sampling Texture Panel cleanup

2013-01-22 18:42:16 +00:00

properties_world.py

style cleanup

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

space_clip.py

style cleanup

2013-01-15 23:15:32 +00:00

space_console.py

console auto-complete button looked silly when aligned against a menu.

2012-12-09 05:18:56 +00:00

space_dopesheet.py

style cleanup

2013-01-15 23:15:32 +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

Get rid of the BRUSH_FIXED_TEX flag, use mapping modes instead. Version

2013-01-16 14:36:13 +00:00

space_info.py

File Menu, "Save startup file" no asks for save-over confirm.

2013-01-23 12:08:23 +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

…

space_sequencer.py

changes needed for EDL import to work again.

2013-01-02 16:15:45 +00:00

space_text.py

style cleanup

2013-01-15 23:15:32 +00:00

space_time.py

rigidbody: Add point cache support

2013-01-23 05:56:34 +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

UI todo:

2013-01-23 16:01:35 +00:00

space_view3d_toolbar.py

rigidbody: Add rigid body constraints

2013-01-23 05:56:56 +00:00

space_view3d.py

Merged changes in the trunk up to revision 54110.

2013-01-26 23:49:13 +00:00