kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Merge branch 'blender-v2.92-release'

Browse Source
This commit is contained in:
Hans Goudey 2021-01-13 11:21:09 -06:00
commit 00b2c7c5cc
7 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/userdef/userdef_default_theme.c
View File

@ -836,7 +836,7 @@ const bTheme U_theme_default = {
.nodeclass_filter = RGBA(0x584d80ff), .nodeclass_filter = RGBA(0x584d80ff),
.nodeclass_vector = RGBA(0x9b80ffff), .nodeclass_vector = RGBA(0x9b80ffff),
.nodeclass_texture = RGBA(0xe68745ff), .nodeclass_texture = RGBA(0xe68745ff),
.nodeclass_shader = RGBA(0xea7581ff), .nodeclass_shader = RGBA(0x63c763ff),
.nodeclass_script = RGBA(0x084d4dff), .nodeclass_script = RGBA(0x084d4dff),
.nodeclass_pattern = RGBA(0x6c696fff), .nodeclass_pattern = RGBA(0x6c696fff),
.nodeclass_layout = RGBA(0x6c696fff), .nodeclass_layout = RGBA(0x6c696fff),

2
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
View File

@ -592,7 +592,7 @@ class GreasePencilMaterialsPanel:
if show_full_ui: if show_full_ui:
row = layout.row() row = layout.row()
row.template_ID(ob, "active_material", new="material.new", duplicate="material.duplicate", live_icon=True) row.template_ID(ob, "active_material", new="material.new", live_icon=True)
slot = context.material_slot slot = context.material_slot
if slot: if slot:

6
release/scripts/startup/bl_ui/space_node.py
View File

@ -93,10 +93,10 @@ class NODE_HT_header(Header):
# Show material.new when no active ID/slot exists # Show material.new when no active ID/slot exists
if not id_from and ob_type in types_that_support_material: if not id_from and ob_type in types_that_support_material:
row.template_ID(ob, "active_material", new="material.new", duplicate="material.duplicate") row.template_ID(ob, "active_material", new="material.new")
# Material ID, but not for Lights # Material ID, but not for Lights
if id_from and ob_type != 'LIGHT': if id_from and ob_type != 'LIGHT':
row.template_ID(id_from, "active_material", new="material.new", duplicate="material.duplicate") row.template_ID(id_from, "active_material", new="material.new")
if snode.shader_type == 'WORLD': if snode.shader_type == 'WORLD':
NODE_MT_editor_menus.draw_collapsible(context, layout) NODE_MT_editor_menus.draw_collapsible(context, layout)
@ -109,7 +109,7 @@ class NODE_HT_header(Header):
row = layout.row() row = layout.row()
row.enabled = not snode.pin row.enabled = not snode.pin
row.template_ID(scene, "world", new="world.new", duplicate="world.duplicate") row.template_ID(scene, "world", new="world.new")
if snode.shader_type == 'LINESTYLE': if snode.shader_type == 'LINESTYLE':
view_layer = context.view_layer view_layer = context.view_layer

2
source/blender/blenkernel/BKE_blender_version.h
View File

@ -39,7 +39,7 @@ extern "C" {
/* Blender file format version. */ /* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION #define BLENDER_FILE_VERSION BLENDER_VERSION
#define BLENDER_FILE_SUBVERSION 0 #define BLENDER_FILE_SUBVERSION 1
/* Minimum Blender version that supports reading file written with the current /* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and show a warning if the file * version. Older Blender versions will test this and show a warning if the file

18
source/blender/blenloader/intern/versioning_290.c
View File

@ -1561,6 +1561,16 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
FOREACH_NODETREE_END; FOREACH_NODETREE_END;
} }
if (!MAIN_VERSION_ATLEAST(bmain, 293, 1)) {
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
if (ntree->type == NTREE_GEOMETRY) {
version_node_socket_name(ntree, GEO_NODE_BOOLEAN, "Geometry A", "Geometry 1");
version_node_socket_name(ntree, GEO_NODE_BOOLEAN, "Geometry B", "Geometry 2");
}
}
FOREACH_NODETREE_END;
}
/** /**
* Versioning code until next subversion bump goes here. * Versioning code until next subversion bump goes here.
* *
@ -1572,13 +1582,5 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
*/ */
{ {
/* Keep this block, even when empty. */ /* Keep this block, even when empty. */
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
if (ntree->type == NTREE_GEOMETRY) {
version_node_socket_name(ntree, GEO_NODE_BOOLEAN, "Geometry A", "Geometry 1");
version_node_socket_name(ntree, GEO_NODE_BOOLEAN, "Geometry B", "Geometry 2");
}
FOREACH_NODETREE_END;
}
} }
} }

2
source/blender/blenloader/intern/versioning_userdef.c
View File

@ -257,7 +257,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(space_node.nodeclass_attribute); FROM_DEFAULT_V4_UCHAR(space_node.nodeclass_attribute);
} }
if (!USER_VERSION_ATLEAST(292, 6)) { if (!USER_VERSION_ATLEAST(292, 12)) {
FROM_DEFAULT_V4_UCHAR(space_node.nodeclass_shader); FROM_DEFAULT_V4_UCHAR(space_node.nodeclass_shader);
} }

2
source/blender/editors/space_node/drawnode.c
View File

@ -3525,7 +3525,7 @@ static const float std_node_socket_colors[][4] = {
{0.63, 0.63, 0.63, 1.0}, /* SOCK_FLOAT */ {0.63, 0.63, 0.63, 1.0}, /* SOCK_FLOAT */
{0.39, 0.39, 0.78, 1.0}, /* SOCK_VECTOR */ {0.39, 0.39, 0.78, 1.0}, /* SOCK_VECTOR */
{0.78, 0.78, 0.16, 1.0}, /* SOCK_RGBA */ {0.78, 0.78, 0.16, 1.0}, /* SOCK_RGBA */
{0.88, 0.43, 0.46, 1.0}, /* SOCK_SHADER */ {0.39, 0.78, 0.39, 1.0}, /* SOCK_SHADER */
{0.80, 0.65, 0.84, 1.0}, /* SOCK_BOOLEAN */ {0.80, 0.65, 0.84, 1.0}, /* SOCK_BOOLEAN */
{0.0, 0.0, 0.0, 1.0}, /*__SOCK_MESH (deprecated) */ {0.0, 0.0, 0.0, 1.0}, /*__SOCK_MESH (deprecated) */
{0.25, 0.75, 0.26, 1.0}, /* SOCK_INT */ {0.25, 0.75, 0.26, 1.0}, /* SOCK_INT */