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

Merge branch 'blender-v3.2-release'

Browse Source
This commit is contained in:
Aaron Carlisle
2022-05-22 21:58:45 -04:00
parent d095fcd6b4 568b692bcf
commit 04ed96136b
6 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
View File

@@ -109,7 +109,7 @@ static void reduce_stroke_points(bGPdata *gpd,
const int points_num,
const eBuildGpencil_Transition transition)
{
if (points_num == 0) {
if ((points_num == 0) || (gps->points == NULL)) {
clear_stroke(gpf, gps);
return;
}

1
source/blender/imbuf/IMB_colormanagement.h
View File

@@ -54,6 +54,7 @@ bool IMB_colormanagement_space_is_scene_linear(struct ColorSpace *colorspace);
bool IMB_colormanagement_space_is_srgb(struct ColorSpace *colorspace);
bool IMB_colormanagement_space_name_is_data(const char *name);
bool IMB_colormanagement_space_name_is_scene_linear(const char *name);
bool IMB_colormanagement_space_name_is_srgb(const char *name);
/**
* Convert a float RGB triplet to the correct luminance weighted average.

6
source/blender/imbuf/intern/colormanagement.c
View File

@@ -1412,6 +1412,12 @@ bool IMB_colormanagement_space_name_is_scene_linear(const char *name)
return (colorspace && IMB_colormanagement_space_is_scene_linear(colorspace));
}
bool IMB_colormanagement_space_name_is_srgb(const char *name)
{
ColorSpace *colorspace = colormanage_colorspace_get_named(name);
return (colorspace && IMB_colormanagement_space_is_srgb(colorspace));
}
const float *IMB_colormanagement_get_xyz_to_rgb()
{
return &imbuf_xyz_to_rgb[0][0];

2
source/blender/io/usd/CMakeLists.txt
View File

@@ -43,6 +43,7 @@ set(INC
../../bmesh
../../depsgraph
../../editors/include
../../imbuf
../../makesdna
../../makesrna
../../windowmanager
@@ -114,6 +115,7 @@ set(SRC
set(LIB
bf_blenkernel
bf_blenlib
bf_imbuf
bf_io_common
)

9
source/blender/io/usd/intern/usd_writer_material.cc
View File

@@ -10,6 +10,8 @@
#include "BKE_main.h"
#include "BKE_node.h"
#include "IMB_colormanagement.h"
#include "BLI_fileops.h"
#include "BLI_linklist.h"
#include "BLI_listbase.h"
@@ -414,13 +416,10 @@ static pxr::TfToken get_node_tex_image_color_space(bNode *node)
Image *ima = reinterpret_cast<Image *>(node->id);
if (strcmp(ima->colorspace_settings.name, "Raw") == 0) {
if (IMB_colormanagement_space_name_is_data(ima->colorspace_settings.name)) {
return usdtokens::raw;
}
if (strcmp(ima->colorspace_settings.name, "Non-Color") == 0) {
return usdtokens::raw;
}
if (strcmp(ima->colorspace_settings.name, "sRGB") == 0) {
if (IMB_colormanagement_space_name_is_srgb(ima->colorspace_settings.name)) {
return usdtokens::sRGB;
}

4
source/blender/nodes/composite/nodes/node_composite_map_range.cc
View File

@@ -18,9 +18,9 @@ static void cmp_node_map_range_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Float>(N_("Value")).default_value(1.0f).min(0.0f).max(1.0f);
b.add_input<decl::Float>(N_("From Min")).default_value(0.0f).min(-10000.0f).max(10000.0f);
b.add_input<decl::Float>(N_("From Max")).default_value(0.0f).min(-10000.0f).max(10000.0f);
b.add_input<decl::Float>(N_("From Max")).default_value(1.0f).min(-10000.0f).max(10000.0f);
b.add_input<decl::Float>(N_("To Min")).default_value(0.0f).min(-10000.0f).max(10000.0f);
b.add_input<decl::Float>(N_("To Max")).default_value(0.0f).min(-10000.0f).max(10000.0f);
b.add_input<decl::Float>(N_("To Max")).default_value(1.0f).min(-10000.0f).max(10000.0f);
b.add_output<decl::Float>(N_("Value"));
}