diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-03 18:10:01 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-03 18:10:01 +0300 |
| commit | 1bc0cd00713a573bed76ab35b6ae0cc0e9edc307 (patch) | |
| tree | a24e6f88aee2a999b187dd416bef941af6450677 /release | |
| parent | 065a84c8d0d68edece9a407dbe97828fe22d3a6f (diff) | |
| parent | db989e1f118071aae6dcd9f29d10182bd5ebed0b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| m--------- | release/scripts/addons_contrib | 0 | ||||
| -rw-r--r-- | release/scripts/startup/nodeitems_builtins.py | 1 |
4 files changed, 1 insertions, 0 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject cd65bc3277eda27e1c0b9f20a25928f6586d89a +Subproject c93ed11a47b3016cf59711ec16de2e2e94c30e9 diff --git a/release/scripts/addons b/release/scripts/addons -Subproject f5536e5e49c34dfc0a7b8990257cd393339e23c +Subproject 371960484a38fc64e0a2635170a41a0d8ab2f6b diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject 310578043dec1aae382eb6a447ae1d103792d7e +Subproject a8515cfdfe9a98127b592f36fcbe51b7e23b969 diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 7a8e51d5590..dc8462f1af1 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -301,6 +301,7 @@ shader_node_categories = [ NodeItem("ShaderNodeMapping"), NodeItem("ShaderNodeBump"), NodeItem("ShaderNodeDisplacement"), + NodeItem("ShaderNodeVectorDisplacement"), NodeItem("ShaderNodeNormalMap"), NodeItem("ShaderNodeNormal"), NodeItem("ShaderNodeVectorCurve"), |