Tamito Kajiyama 329b05dcd7 Merged changes in the trunk up to revision 47381. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

2012-06-03 21:11:10 +00:00

..

__init__.py

picky cleanup to use of bpy.types

2012-01-18 06:11:56 +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

Finish changes in up/down arrows for menus

2012-05-23 14:24:40 +00:00

properties_data_bone.py

Bugfix [#31469] 'cyclic offset' option is broken

2012-05-16 02:40:14 +00:00

properties_data_camera.py

Fisheye Camera for Cycles

2012-05-04 16:20:51 +00:00

properties_data_curve.py

Added start and end bevel factor for curves, so now it's possible to make

2012-05-04 17:04: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

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

Finish changes in up/down arrows for menus

2012-05-23 14:24:40 +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

solidify option to flip normals

2012-05-26 09:18:47 +00:00

properties_data_speaker.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +00:00

properties_game.py

BGE #30734: add support for physics linear and angular thresholds and deactivation time from python and GUI.

2012-05-29 20:30:33 +00:00

properties_material.py

Finish changes in up/down arrows for menus

2012-05-23 14:24:40 +00:00

properties_object_constraint.py

code cleanup: remove unused imports/defines + other redundant code.

2012-04-08 13:11:25 +00:00

properties_object.py

style cleanup: pep8

2012-05-15 18:50:51 +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: pep8, also quiet compiler warning.

2012-04-20 18:50:18 +00:00

properties_physics_cloth.py

UI:

2012-04-15 21:10:14 +00:00

properties_physics_common.py

Point Cache: allow baking external smoke caches. This needs to be cleaned up

2012-04-28 09:00:11 +00:00

properties_physics_dynamicpaint.py

replace relative imports with absolute imports so scritps can be executed directly (live editing).

2012-04-04 14:39:52 +00:00

properties_physics_field.py

Remove "Use Root Coordinates" from the interface

2012-05-15 15:55:59 +00:00

properties_physics_fluid.py

Fix [#30954] Fluid obstacle checkbox has no effect

2012-04-21 22:09:09 +00:00

properties_physics_smoke.py

stule cleanup: pep8

2012-05-01 13:32:55 +00:00

properties_physics_softbody.py

replace relative imports with absolute imports so scritps can be executed directly (live editing).

2012-04-04 14:39:52 +00:00

properties_render.py

New options for specifying unit line thickness.

2012-04-10 23:53:46 +00:00

properties_scene.py

KeyingSets UI stuff - Replaced names used in RNA enum instead of redefining

2012-05-17 10:10:11 +00:00

properties_texture.py

Finish changes in up/down arrows for menus

2012-05-23 14:24:40 +00:00

properties_world.py

2.6 UI:

2012-03-10 20:30:05 +00:00

space_clip.py

style cleanup: pep8

2012-05-15 18:50:51 +00:00

space_console.py

patch [#31359] Py Console: Empty current line

2012-05-09 14:58:57 +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

replace relative imports with absolute imports so scritps can be executed directly (live editing).

2012-04-04 14:39:52 +00:00

space_info.py

Renamed the COLLADA Import/export labels to 'Collada (Default)' to make it better separatable from target specific exporters

2012-05-20 17:40:57 +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

style cleanup: nodes, also rename chunksize -> chunk_size

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

space_outliner.py

Fixing issues with i18n stuff:

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

space_sequencer.py

Sequencer UI:

2012-05-20 15:52:24 +00:00

space_text.py

style cleanup: pep8

2012-05-15 18:50:51 +00:00

space_time.py

style cleanup: pep8

2012-05-15 18:50:51 +00:00

space_userpref_keymap.py

code cleanup: remove unused imports/defines + other redundant code.

2012-04-08 13:11:25 +00:00

space_userpref.py

Add "Install Theme" button in user preferences, patch #31505 by Julien Duroure.

2012-05-18 12:49:27 +00:00

space_view3d_toolbar.py

Add input sample averaging to PaintStroke.

2012-05-21 23:32:46 +00:00

space_view3d.py

Merged changes in the trunk up to revision 47056.

2012-05-26 22:22:45 +00:00