griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Brecht Van Lommel
2024-03-14 14:12:05 +01:00
parent a5229ed125 e9ca817d5f
commit f131709122
2 changed files with 87 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/sculpt_paint/sculpt_dyntopo.cc
View File

@@ -99,7 +99,7 @@ void enable_ex(Main *bmain, Depsgraph *depsgraph, Object *ob)
BM_mesh_bm_from_me(ss->bm, mesh, &convert_params);
triangulate(ss->bm);
BM_data_layer_add_named(ss->bm, &ss->bm->vdata, CD_PROP_FLOAT, ".sculpt_mask");
BM_data_layer_ensure_named(ss->bm, &ss->bm->vdata, CD_PROP_FLOAT, ".sculpt_mask");
/* Make sure the data for existing faces are initialized. */
if (mesh->faces_num != ss->bm->totface) {

170
source/blender/imbuf/intern/colormanagement.cc
View File

@@ -448,7 +448,7 @@ static void colormanage_cache_handle_release(void *cache_handle)
/** \name Initialization / De-initialization
* \{ */
static void colormanage_role_color_space_name_get(OCIO_ConstConfigRcPtr *config,
static bool colormanage_role_color_space_name_get(OCIO_ConstConfigRcPtr *config,
char *colorspace_name,
const char *role,
const char *backup_role)
@@ -457,56 +457,56 @@ static void colormanage_role_color_space_name_get(OCIO_ConstConfigRcPtr *config,
ociocs = OCIO_configGetColorSpace(config, role);
if (!ociocs && backup_role) {
if (ociocs == nullptr && backup_role) {
ociocs = OCIO_configGetColorSpace(config, backup_role);
}
if (ociocs) {
const char *name = OCIO_colorSpaceGetName(ociocs);
if (ociocs == nullptr) {
/* Overall fallback role. */
ociocs = OCIO_configGetColorSpace(config, "default");
}
/* assume function was called with buffer properly allocated to MAX_COLORSPACE_NAME chars */
BLI_strncpy(colorspace_name, name, MAX_COLORSPACE_NAME);
OCIO_colorSpaceRelease(ociocs);
}
else {
printf("Color management: Error could not find role %s role.\n", role);
if (ociocs == nullptr) {
printf("Color management: Error, could not find role \"%s\"\n", role);
return false;
}
const char *name = OCIO_colorSpaceGetName(ociocs);
/* assume function was called with buffer properly allocated to MAX_COLORSPACE_NAME chars */
BLI_strncpy(colorspace_name, name, MAX_COLORSPACE_NAME);
OCIO_colorSpaceRelease(ociocs);
return true;
}
static void colormanage_load_config(OCIO_ConstConfigRcPtr *config)
static bool colormanage_load_config(OCIO_ConstConfigRcPtr *config)
{
int tot_colorspace, tot_display, tot_display_view, tot_looks;
int index, viewindex, viewindex2;
const char *name;
bool ok = true;
/* get roles */
colormanage_role_color_space_name_get(config, global_role_data, OCIO_ROLE_DATA, nullptr);
colormanage_role_color_space_name_get(
ok &= colormanage_role_color_space_name_get(config, global_role_data, OCIO_ROLE_DATA, nullptr);
ok &= colormanage_role_color_space_name_get(
config, global_role_scene_linear, OCIO_ROLE_SCENE_LINEAR, nullptr);
colormanage_role_color_space_name_get(
ok &= colormanage_role_color_space_name_get(
config, global_role_color_picking, OCIO_ROLE_COLOR_PICKING, nullptr);
colormanage_role_color_space_name_get(
ok &= colormanage_role_color_space_name_get(
config, global_role_texture_painting, OCIO_ROLE_TEXTURE_PAINT, nullptr);
colormanage_role_color_space_name_get(
ok &= colormanage_role_color_space_name_get(
config, global_role_default_sequencer, OCIO_ROLE_DEFAULT_SEQUENCER, OCIO_ROLE_SCENE_LINEAR);
colormanage_role_color_space_name_get(
ok &= colormanage_role_color_space_name_get(
config, global_role_default_byte, OCIO_ROLE_DEFAULT_BYTE, OCIO_ROLE_TEXTURE_PAINT);
colormanage_role_color_space_name_get(
ok &= colormanage_role_color_space_name_get(
config, global_role_default_float, OCIO_ROLE_DEFAULT_FLOAT, OCIO_ROLE_SCENE_LINEAR);
/* load colorspaces */
tot_colorspace = OCIO_configGetNumColorSpaces(config);
for (index = 0; index < tot_colorspace; index++) {
OCIO_ConstColorSpaceRcPtr *ocio_colorspace;
const char *description;
bool is_invertible, is_data;
const int tot_colorspace = OCIO_configGetNumColorSpaces(config);
for (int index = 0; index < tot_colorspace; index++) {
const char *name = OCIO_configGetColorSpaceNameByIndex(config, index);
name = OCIO_configGetColorSpaceNameByIndex(config, index);
ocio_colorspace = OCIO_configGetColorSpace(config, name);
description = OCIO_colorSpaceGetDescription(ocio_colorspace);
is_invertible = OCIO_colorSpaceIsInvertible(ocio_colorspace);
is_data = OCIO_colorSpaceIsData(ocio_colorspace);
OCIO_ConstColorSpaceRcPtr *ocio_colorspace = OCIO_configGetColorSpace(config, name);
const char *description = OCIO_colorSpaceGetDescription(ocio_colorspace);
const bool is_invertible = OCIO_colorSpaceIsInvertible(ocio_colorspace);
const bool is_data = OCIO_colorSpaceIsData(ocio_colorspace);
ColorSpace *colorspace = colormanage_colorspace_add(name, description, is_invertible, is_data);
@@ -525,51 +525,49 @@ static void colormanage_load_config(OCIO_ConstConfigRcPtr *config)
}
/* load displays */
viewindex2 = 0;
tot_display = OCIO_configGetNumDisplays(config);
const int tot_display = OCIO_configGetNumDisplays(config);
int viewindex2 = 0;
for (index = 0; index < tot_display; index++) {
const char *displayname;
ColorManagedDisplay *display;
for (int index = 0; index < tot_display; index++) {
const char *displayname = OCIO_configGetDisplay(config, index);
displayname = OCIO_configGetDisplay(config, index);
display = colormanage_display_add(displayname);
ColorManagedDisplay *display = colormanage_display_add(displayname);
/* load views */
tot_display_view = OCIO_configGetNumViews(config, displayname);
for (viewindex = 0; viewindex < tot_display_view; viewindex++, viewindex2++) {
const char *viewname;
ColorManagedView *view;
LinkData *display_view;
viewname = OCIO_configGetView(config, displayname, viewindex);
const int tot_display_view = OCIO_configGetNumViews(config, displayname);
for (int viewindex = 0; viewindex < tot_display_view; viewindex++, viewindex2++) {
const char *viewname = OCIO_configGetView(config, displayname, viewindex);
/* first check if view transform with given name was already loaded */
view = colormanage_view_get_named(viewname);
ColorManagedView *view = colormanage_view_get_named(viewname);
if (!view) {
view = colormanage_view_add(viewname);
}
display_view = BLI_genericNodeN(view);
LinkData *display_view = BLI_genericNodeN(view);
BLI_addtail(&display->views, display_view);
}
}
global_tot_display = tot_display;
if (global_tot_display == 0) {
printf("Color management: Error, could not find any displays\n");
ok = false;
}
else if (global_tot_view == 0) {
printf("Color management: Error, could not find any views\n");
ok = false;
}
/* load looks */
tot_looks = OCIO_configGetNumLooks(config);
const int tot_looks = OCIO_configGetNumLooks(config);
colormanage_look_add("None", "", true);
for (index = 0; index < tot_looks; index++) {
OCIO_ConstLookRcPtr *ocio_look;
const char *process_space;
name = OCIO_configGetLookNameByIndex(config, index);
ocio_look = OCIO_configGetLook(config, name);
process_space = OCIO_lookGetProcessSpace(ocio_look);
for (int index = 0; index < tot_looks; index++) {
const char *name = OCIO_configGetLookNameByIndex(config, index);
OCIO_ConstLookRcPtr *ocio_look = OCIO_configGetLook(config, name);
const char *process_space = OCIO_lookGetProcessSpace(ocio_look);
OCIO_lookRelease(ocio_look);
colormanage_look_add(name, process_space, false);
@@ -587,6 +585,8 @@ static void colormanage_load_config(OCIO_ConstConfigRcPtr *config)
mul_m3_m3m3(imbuf_aces_to_scene_linear, imbuf_xyz_to_scene_linear, OCIO_ACES_TO_XYZ);
invert_m3_m3(imbuf_scene_linear_to_aces, imbuf_aces_to_scene_linear);
return ok;
}
static void colormanage_free_config()
@@ -645,60 +645,61 @@ static void colormanage_free_config()
/* free looks */
BLI_freelistN(&global_looks);
global_tot_looks = 0;
OCIO_exit();
}
void colormanagement_init()
{
const char *ocio_env;
char configfile[FILE_MAX];
OCIO_ConstConfigRcPtr *config = nullptr;
OCIO_init();
ocio_env = BLI_getenv("OCIO");
/* First try config from environment variable. */
const char *ocio_env = BLI_getenv("OCIO");
if (ocio_env && ocio_env[0] != '\0') {
config = OCIO_configCreateFromEnv();
if (config != nullptr) {
printf("Color management: Using %s as a configuration file\n", ocio_env);
OCIO_setCurrentConfig(config);
const bool ok = colormanage_load_config(config);
OCIO_configRelease(config);
if (!ok) {
printf("Color management: Failed to load config from environment\n");
colormanage_free_config();
config = nullptr;
}
}
}
/* Then try bunded config file. */
if (config == nullptr) {
const std::optional<std::string> configdir = BKE_appdir_folder_id(BLENDER_DATAFILES,
"colormanagement");
if (configdir.has_value()) {
char configfile[FILE_MAX];
BLI_path_join(configfile, sizeof(configfile), configdir->c_str(), BCM_CONFIG_FILE);
config = OCIO_configCreateFromFile(configfile);
if (config != nullptr) {
OCIO_setCurrentConfig(config);
const bool ok = colormanage_load_config(config);
OCIO_configRelease(config);
if (!ok) {
printf("Color management: Failed to load bundled config\n");
colormanage_free_config();
config = nullptr;
}
}
}
}
/* Then use fallback. */
if (config == nullptr) {
printf("Color management: using fallback mode for management\n");
config = OCIO_configCreateFallback();
}
if (config) {
OCIO_setCurrentConfig(config);
colormanage_load_config(config);
OCIO_configRelease(config);
}
/* If there are no valid display/views, use fallback mode. */
if (global_tot_display == 0 || global_tot_view == 0) {
printf("Color management: no displays/views in the config, using fallback mode instead\n");
/* Free old config. */
colormanage_free_config();
/* Initialize fallback config. */
printf("Color management: Using fallback mode for management\n");
config = OCIO_configCreateFallback();
colormanage_load_config(config);
}
@@ -730,6 +731,7 @@ void colormanagement_exit()
memset(&global_color_picking_state, 0, sizeof(global_color_picking_state));
colormanage_free_config();
OCIO_exit();
}
/** \} */