diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-09-17 17:46:21 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-09-17 17:46:21 +0300 |
| commit | 7b8bfec06deac3dc30c25b3c9bacac4cfd32e259 (patch) | |
| tree | b4bbf8bef890d0f42b9279f638e9483050962517 | |
| parent | 20bc9aadc60c46aad568f0d4e0d3ef1555ca66e4 (diff) | |
| parent | a9c5e1d9b7927a2d35da05eea0f4e204e8d78fa4 (diff) | |
Merge branch 'master' into blender-v2.76-release
| -rw-r--r-- | release/datafiles/splash.png | bin | 187546 -> 140110 bytes | |||
| -rw-r--r-- | release/datafiles/splash_2x.png | bin | 632582 -> 444285 bytes | |||
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_relationships.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png Binary files differindex cfadec07b09..f84f092d5f8 100644 --- a/release/datafiles/splash.png +++ b/release/datafiles/splash.png diff --git a/release/datafiles/splash_2x.png b/release/datafiles/splash_2x.png Binary files differindex 79a6f2781ff..f4c611c8cc1 100644 --- a/release/datafiles/splash_2x.png +++ b/release/datafiles/splash_2x.png diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 2a9583b99d2..e096c9a6473 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -41,8 +41,8 @@ extern "C" { /* these lines are grep'd, watch out for our not-so-awesome regex * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ -#define BLENDER_VERSION 275 -#define BLENDER_SUBVERSION 4 +#define BLENDER_VERSION 276 +#define BLENDER_SUBVERSION 0 /* Several breakages with 270, e.g. constraint deg vs rad */ #define BLENDER_MINVERSION 270 #define BLENDER_MINSUBVERSION 5 @@ -51,7 +51,7 @@ extern "C" { /* can be left blank, otherwise a,b,c... etc with no quotes */ #define BLENDER_VERSION_CHAR /* alpha/beta/rc/release, docs use this */ -#define BLENDER_VERSION_CYCLE alpha +#define BLENDER_VERSION_CYCLE rc extern char versionstr[]; /* from blender.c */ diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c index 76e424f9eca..7286b6fbc0c 100644 --- a/source/blender/editors/space_node/node_relationships.c +++ b/source/blender/editors/space_node/node_relationships.c @@ -1600,7 +1600,7 @@ static void node_link_insert_offset_ntree( node_offset_apply(offs_node, addval); } else if (!insert->parent && offs_node->parent) { - node_offset_apply(offs_node->parent, addval); + node_offset_apply(nodeFindRootParent(offs_node), addval); } margin = addval; } |
