This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Bastien Montagne 9be6d5ff18 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
	source/blender/makesrna/intern/rna_main_api.c
	source/blender/makesrna/intern/rna_particle.c

2016-12-12 16:17:57 +01:00

..

__init__.py

Merge branch 'master' into blender2.8

2016-06-07 09:59:26 +02:00

properties_animviz.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_constraint.py

Basic Alembic support

2016-08-06 10:58:13 +02:00

properties_data_armature.py

Pose Library pose list: Default to 5 rows to match the new up/down buttons

2016-09-16 18:21:25 +02:00

properties_data_bone.py

Cleanup: unused vars, imports, pep8

2016-08-01 11:55:06 +10:00

properties_data_camera.py

Cycles: Pole merging for spherical stereo

2016-05-18 10:56:57 +02:00

properties_data_curve.py

UI: Remove spaces around '/'

2016-07-15 15:50:42 +10:00

properties_data_empty.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_data_lamp.py

Full Inverse-Quadratic-Equation Lamp Falloff

2016-03-13 02:05:36 +01:00

properties_data_lattice.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_data_mesh.py

Added 'delete unlocked vertex groups' option.

2016-10-31 15:31:47 +01:00

properties_data_metaball.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_data_modifier.py

Merge branch 'master' into blender2.8

2016-12-12 16:17:57 +01:00

properties_data_speaker.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_freestyle.py

Cleanup: pep8

2015-09-01 13:03:38 +10:00

properties_game.py

Use COMPAT_ENGINES instead of RenderEngine.use_game_engine for panel poll methods

2016-07-27 19:00:35 -07:00

properties_grease_pencil_common.py

Grease Pencil: Fix python errors opening N panel -> GP with empty VSE

2016-11-11 14:04:04 +01:00

properties_mask_common.py

Cleanup: pep8, spelling

2015-04-22 16:26:54 +10:00

properties_material.py

BGE: grey out Alpha and Specular sliders when Transparency panel is

2015-05-22 16:03:38 +02:00

properties_object.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_paint_common.py

Merge branch 'master' into blender2.8

2016-11-19 16:28:39 +01:00

properties_physics_cloth.py

Merge branch 'master' into blender2.8

2016-08-06 12:45:03 +02:00

properties_physics_common.py

Merge branch 'master' into blender2.8

2016-08-06 12:45:03 +02:00

properties_physics_dynamicpaint.py

Merge branch 'master' into blender2.8

2016-08-06 12:45:03 +02:00

properties_physics_field.py

Use COMPAT_ENGINES instead of RenderEngine.use_game_engine for panel poll methods

2016-07-27 19:00:35 -07:00

properties_physics_fluid.py

Use COMPAT_ENGINES instead of RenderEngine.use_game_engine for panel poll methods

2016-07-27 19:00:35 -07:00

properties_physics_rigidbody_constraint.py

Expose Bullet rotational spring settings in the UI.

2016-11-07 12:59:12 +03:00

properties_physics_rigidbody.py

Use COMPAT_ENGINES instead of RenderEngine.use_game_engine for panel poll methods

2016-07-27 19:00:35 -07:00

properties_physics_smoke.py

Merge branch 'master' into blender2.8

2016-12-12 16:17:57 +01:00

properties_physics_softbody.py

Merge branch 'master' into blender2.8

2016-08-06 12:45:03 +02:00

properties_render_layer.py

Collapse multiview panel in render layers by default

2015-08-08 20:55:51 +02:00

properties_render.py

FFmpeg interface improvements

2016-09-21 15:03:11 +02:00

properties_scene.py

Removed UI for point cache users.

2016-04-28 18:38:10 +02:00

properties_texture.py

Removed most partical-related code from UI scripts.

2016-04-12 16:28:00 +02:00

properties_world.py

Use COMPAT_ENGINES instead of RenderEngine.use_game_engine for panel poll methods

2016-07-27 19:00:35 -07:00

space_clip.py

2D stabilization: change presentation of target_scale in UI

2016-08-23 11:53:35 +02:00

space_console.py

Fix T48703: Name inconsistency w/ area maximize/fullscreen

2016-06-22 07:47:30 +10:00

space_dopesheet.py

Merge branch 'master' into blender2.8

2016-08-06 12:45:03 +02:00

space_filebrowser.py

Revert part of rB4d9345479aa86f61, and cleanup a bit.

2015-10-16 11:21:12 +02:00

space_graph.py

Code Cleanup - Circle/Lasso select in the Graph Editor

2016-06-24 03:18:34 +12:00

space_image.py

Fix menu inconsistencies

2016-11-15 16:07:32 +01:00

space_info.py

UI: Previews for screen layouts

2016-12-01 17:19:58 +01:00

space_logic.py

Fix T48703: Name inconsistency w/ area maximize/fullscreen

2016-06-22 07:47:30 +10:00

space_nla.py

NLA: Indicate position of action-local markers on strips

2016-07-08 01:47:32 +12:00

space_node.py

Grease Pencil v2 Branch

2016-08-03 23:39:36 +02:00

space_outliner.py

Fix T48703: Name inconsistency w/ area maximize/fullscreen

2016-06-22 07:47:30 +10:00

space_properties.py

UI: Replace +/- menus with collapsible ones

2014-01-27 18:42:11 +11:00

space_sequencer.py

Grease Pencil v2 Branch

2016-08-03 23:39:36 +02:00

space_text.py

Fix T48703: Name inconsistency w/ area maximize/fullscreen

2016-06-22 07:47:30 +10:00

space_time.py

Merge branch 'master' into blender2.8

2016-06-22 13:12:44 +02:00

space_userpref.py

Merge branch 'master' into blender2.8

2016-12-01 10:29:46 +01:00

space_view3d_toolbar.py

Merge remote-tracking branch 'origin/master' into blender2.8

2016-11-16 17:04:21 +01:00

space_view3d.py

Merge branch 'master' into blender2.8

2016-12-12 16:17:57 +01:00