diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png index cfadec07b09af8cd19d200358a0e874a9edc080e..f84f092d5f8baa93edbc1547f18fa88b3dd5a5ca 100644 Binary files a/release/datafiles/splash.png and b/release/datafiles/splash.png differ diff --git a/release/datafiles/splash_2x.png b/release/datafiles/splash_2x.png index 79a6f2781ff24aa98a2021531f5efcebfb7800b6..f4c611c8cc1aa5398775be949695803b848e5dff 100644 Binary files a/release/datafiles/splash_2x.png and b/release/datafiles/splash_2x.png differ diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 2a9583b99d2304722e0c867723813f9e26f92242..e096c9a647336949aa8834341ebacdfd6f0d0900 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 76e424f9eca200964371d90fb05de360eb103879..7286b6fbc0c3ea81e045f063eabd822e89f04267 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; }