Tamito Kajiyama 8925ed1420 Merged changes in the trunk up to revision 46557. ...

Conflicts resolved:
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/makesrna/intern/rna_scene.c

Additional changes:
* Fix for recent changes of BKE_* function renaming.
* Fix for an "attempt to free NULL pointer" in BlenderStrokeRenderer::RenderStrokeRepBasic().

2012-05-11 22:48:41 +00:00

..

__init__.py

picky cleanup to use of bpy.types

2012-01-18 06:11:56 +00:00

properties_animviz.py

Bugfixes for Motion Path drawing/updating in light of the recent changes:

2012-05-06 04:18:13 +00:00

properties_data_armature.py

Removing the old armature 'deform' settings (use vertex groups/envelopes/quats).

2012-05-06 04:50:04 +00:00

properties_data_bone.py

Patch #30611: grey out bone show wireframe option if no custom shape is set,

2012-03-20 20:06:10 +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

there was no way to reset timing for absolute shape keys, add an operator to do so.

2012-04-05 06:10:15 +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

stule cleanup: pep8

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

properties_data_speaker.py

pep/style edits & quiet some warnings

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

properties_game.py

stule cleanup: pep8

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

properties_material.py

pep/style edits & quiet some warnings

2011-11-11 03:28:46 +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

Motion Paths GUI Cleanup

2012-05-01 16:19:13 +00:00

properties_paint_common.py

Add per-brush weight field.

2012-04-29 20:04:25 +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

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

2012-04-04 14:39:52 +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

Fixing several issues with keyingsets:

2012-03-08 14:04:06 +00:00

properties_texture.py

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

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

properties_world.py

2.6 UI:

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

space_clip.py

Camera tracking: switch dopesheet information to lazy calculation

2012-05-03 23:15:01 +00:00

space_console.py

patch [#31359] Py Console: Empty current line

2012-05-09 14:58:57 +00:00

space_dopesheet.py

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

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

space_filebrowser.py

RNA:

2011-11-07 16:26:53 +00:00

space_graph.py

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

2012-04-04 14:39:52 +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

stule cleanup: pep8

2012-05-01 13:32:55 +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

Code Cleanup: pep8 edits

2012-02-04 11:10:41 +00:00

space_outliner.py

Fixing issues with i18n stuff:

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

space_sequencer.py

minor changes to sequencer api

2012-05-10 15:32:01 +00:00

space_text.py

Fix for [#31327] Text editor menu incorrect (Patch attached)

2012-05-06 07:59:37 +00:00

space_time.py

Timeline Header: Only show the "use active keyingset only" toggle (beside the

2012-05-06 06:57:02 +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

User Preferences/ Themes

2012-04-28 17:16:38 +00:00

space_view3d_toolbar.py

Add mask brush for sculpt mode.

2012-05-10 20:35:32 +00:00

space_view3d.py

Merged changes in the trunk up to revision 46557.

2012-05-11 22:48:41 +00:00