I hereby claim:
- I am sobotka on github.
- I am troy_s (https://keybase.io/troy_s) on keybase.
- I have a public key ASB0w63ekZ943Od5Mit1fKTzKqjzliON8a2xVnt929Ra3wo
To claim this, I am signing this object:
I hereby claim:
To claim this, I am signing this object:
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h | |
index 4ee5c894b5..d57edd45cc 100644 | |
--- a/source/blender/blenkernel/BKE_node.h | |
+++ b/source/blender/blenkernel/BKE_node.h | |
@@ -700,6 +700,8 @@ void ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMateria | |
#define CMP_NODE_BOKEHBLUR 316 | |
#define CMP_NODE_SWITCH 317 | |
+#define CMP_NODE_SKELETON 330 | |
+ |
diff --git a/source/blender/compositor/intern/COM_SocketReader.h b/source/blender/compositor/intern/COM_SocketReader.h | |
index 88b018ef8b..0563d9e1b0 100644 | |
--- a/source/blender/compositor/intern/COM_SocketReader.h | |
+++ b/source/blender/compositor/intern/COM_SocketReader.h | |
@@ -32,7 +32,8 @@ | |
typedef enum PixelSampler { | |
COM_PS_NEAREST = 0, | |
COM_PS_BILINEAR = 1, | |
- COM_PS_BICUBIC = 2 | |
+ COM_PS_BICUBIC = 2, |
Index: source/blender/compositor/intern/COM_SocketReader.h | |
=================================================================== | |
--- source/blender/compositor/intern/COM_SocketReader.h (revision 51011) | |
+++ source/blender/compositor/intern/COM_SocketReader.h (working copy) | |
@@ -32,7 +32,8 @@ | |
typedef enum PixelSampler { | |
COM_PS_NEAREST = 0, | |
COM_PS_BILINEAR = 1, | |
- COM_PS_BICUBIC = 2 | |
+ COM_PS_BICUBIC = 2, |
/*********************** CubicBSpline Prefilter ****************************/ | |
327 /* This function creates a prefilter in the frequency domain. It can be | |
328 viewed as a compliment to a traditional bicubic filter. */ | |
329 | |
330 void create_prefilter(ImBuf *in, ImBuf *out) | |
331 { | |
332 int x, y; | |
333 | |
334 // A row of float coefficients. | |
335 float *coeff = out->rect_float; |
ffmpeg -i file.dpx -vf scale=out_color_matrix=bt709 -movflags write_colr -color_primaries bt709 -color_trc bt709 -colorspace bt709 -codec prores output.mov |
- !<ColorSpace> | |
name: Input - Panasonic - V-Log - V-Gamut | |
family: Input/Panasonic | |
equalitygroup: "" | |
bitdepth: 32f | |
description: | | |
V-Log - V-Gamut | |
isdata: false | |
allocation: uniform | |
allocationvars: [0, 1] |
- !<ColorSpace> | |
name: Alexa Wide Gamut LogC | |
family: "" | |
equalitygroup: "" | |
bitdepth: 32f | |
description: | | |
LogC Arri Wide Gamut to REC.709 Primaries | |
isdata: false | |
allocation: uniform | |
allocationvars: [0, 1] |
- !<ColorSpace> | |
name: Alexa LogC REC.709 with Adaption | |
family: "" | |
equalitygroup: "" | |
bitdepth: 32f | |
description: | | |
LogC Arri REC.709 with adaption matrix | |
isdata: false | |
allocation: uniform | |
allocationvars: [0, 1] |
diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc | |
index c8716d5..d0ed642 100644 | |
--- a/source/blender/alembic/intern/abc_object.cc | |
+++ b/source/blender/alembic/intern/abc_object.cc | |
@@ -286,7 +286,7 @@ void AbcObjectReader::read_matrix(float r_mat[4][4], const float time, | |
has_alembic_parent = false; | |
} | |
else { | |
- has_alembic_parent = ixform_parent && schema.getInheritsXforms(); | |
+ //has_alembic_parent = ixform_parent && schema.getInheritsXforms(); |