forked from bartvdbraak/blender
Merge branch 'master' into blender2.8
This commit is contained in:
commit
0e0888970d
@ -1249,7 +1249,7 @@ class CyclesRenderLayerSettings(bpy.types.PropertyGroup):
|
||||
cls.denoising_radius = IntProperty(
|
||||
name="Denoising Radius",
|
||||
description="Size of the image area that's used to denoise a pixel (higher values are smoother, but might lose detail and are slower)",
|
||||
min=1, max=50,
|
||||
min=1, max=25,
|
||||
default=8,
|
||||
)
|
||||
cls.denoising_relative_pca = BoolProperty(
|
||||
|
@ -364,7 +364,7 @@ ccl_device_inline void kernel_write_result(KernelGlobals *kg, ccl_global float *
|
||||
}
|
||||
else {
|
||||
kernel_write_pass_float3_variance(buffer + kernel_data.film.pass_denoising_data + DENOISING_PASS_COLOR,
|
||||
sample, L_sum);
|
||||
sample, ensure_finite3(L_sum));
|
||||
}
|
||||
|
||||
kernel_write_pass_float3_variance(buffer + kernel_data.film.pass_denoising_data + DENOISING_PASS_NORMAL,
|
||||
|
@ -23,7 +23,7 @@ ccl_device void kernel_indirect_background(KernelGlobals *kg)
|
||||
int thread_index = ccl_global_id(1) * ccl_global_size(0) + ccl_global_id(0);
|
||||
int ray_index;
|
||||
|
||||
if(kernel_data.integrator.ao_bounces) {
|
||||
if(kernel_data.integrator.ao_bounces != INT_MAX) {
|
||||
ray_index = get_ray_index(kg, thread_index,
|
||||
QUEUE_ACTIVE_AND_REGENERATED_RAYS,
|
||||
kernel_split_state.queue_data,
|
||||
|
@ -176,7 +176,10 @@ ccl_device void math_trimatrix_cholesky(ccl_global float *A, int n, int stride)
|
||||
* symmetrical positive-semidefinite by construction, so we can just use this function with A=Xt*W*X and y=Xt*W*y. */
|
||||
ccl_device_inline void math_trimatrix_vec3_solve(ccl_global float *A, ccl_global float3 *y, int n, int stride)
|
||||
{
|
||||
math_trimatrix_add_diagonal(A, n, 1e-4f, stride); /* Improve the numerical stability. */
|
||||
/* Since the first entry of the design row is always 1, the upper-left element of XtWX is a good
|
||||
* heuristic for the amount of pixels considered (with weighting), therefore the amount of correction
|
||||
* is scaled based on it. */
|
||||
math_trimatrix_add_diagonal(A, n, 3e-7f*A[0], stride); /* Improve the numerical stability. */
|
||||
math_trimatrix_cholesky(A, n, stride); /* Replace A with L so that L*Lt = A. */
|
||||
|
||||
/* Use forward substitution to solve L*b = y, replacing y by b. */
|
||||
|
File diff suppressed because it is too large
Load Diff
1179
release/scripts/presets/interface_theme/dark_blue_gradient.xml
Normal file
1179
release/scripts/presets/interface_theme/dark_blue_gradient.xml
Normal file
File diff suppressed because it is too large
Load Diff
1173
release/scripts/presets/interface_theme/default++.xml
Normal file
1173
release/scripts/presets/interface_theme/default++.xml
Normal file
File diff suppressed because it is too large
Load Diff
1183
release/scripts/presets/interface_theme/modern_minimalist.xml
Normal file
1183
release/scripts/presets/interface_theme/modern_minimalist.xml
Normal file
File diff suppressed because it is too large
Load Diff
1177
release/scripts/presets/interface_theme/north.xml
Normal file
1177
release/scripts/presets/interface_theme/north.xml
Normal file
File diff suppressed because it is too large
Load Diff
1179
release/scripts/presets/interface_theme/sandyslate.xml
Normal file
1179
release/scripts/presets/interface_theme/sandyslate.xml
Normal file
File diff suppressed because it is too large
Load Diff
1177
release/scripts/presets/interface_theme/true_blue_menu.xml
Normal file
1177
release/scripts/presets/interface_theme/true_blue_menu.xml
Normal file
File diff suppressed because it is too large
Load Diff
@ -642,8 +642,9 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
|
||||
col.prop(strip, "translation_unit")
|
||||
col = layout.column(align=True)
|
||||
col.label(text="Position:")
|
||||
col.prop(strip, "translate_start_x", text="X")
|
||||
col.prop(strip, "translate_start_y", text="Y")
|
||||
row = col.row(align=True)
|
||||
row.prop(strip, "translate_start_x", text="X")
|
||||
row.prop(strip, "translate_start_y", text="Y")
|
||||
|
||||
layout.separator()
|
||||
|
||||
@ -655,8 +656,9 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
|
||||
else:
|
||||
col = layout.column(align=True)
|
||||
col.label(text="Scale:")
|
||||
col.prop(strip, "scale_start_x", text="X")
|
||||
col.prop(strip, "scale_start_y", text="Y")
|
||||
row = col.row(align=True)
|
||||
row.prop(strip, "scale_start_x", text="X")
|
||||
row.prop(strip, "scale_start_y", text="Y")
|
||||
|
||||
layout.separator()
|
||||
|
||||
@ -714,7 +716,9 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
|
||||
|
||||
col.prop(strip, "align_x")
|
||||
col.prop(strip, "align_y")
|
||||
col.prop(strip, "location")
|
||||
col.label("Location")
|
||||
row = col.row(align=True)
|
||||
row.prop(strip, "location", text="")
|
||||
col.prop(strip, "wrap_width")
|
||||
layout.operator("sequencer.export_subtitles")
|
||||
|
||||
@ -726,8 +730,9 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
|
||||
if not strip.use_default_fade:
|
||||
col.prop(strip, "effect_fader", text="Effect fader")
|
||||
elif strip.type == 'GAUSSIAN_BLUR':
|
||||
col.prop(strip, "size_x")
|
||||
col.prop(strip, "size_y")
|
||||
row = col.row(align=True)
|
||||
row.prop(strip, "size_x")
|
||||
row.prop(strip, "size_y")
|
||||
|
||||
|
||||
class SEQUENCER_PT_input(SequencerButtonsPanel, Panel):
|
||||
|
@ -486,7 +486,7 @@ void ED_view3d_from_m4(float mat[4][4], float ofs[3], float quat[4], float *dist
|
||||
struct BGpic *ED_view3D_background_image_new(struct View3D *v3d) RET_NULL
|
||||
void ED_view3D_background_image_remove(struct View3D *v3d, struct BGpic *bgpic) RET_NONE
|
||||
void ED_view3D_background_image_clear(struct View3D *v3d) RET_NONE
|
||||
void ED_view3d_update_viewmat(struct Scene *scene, struct View3D *v3d, struct ARegion *ar, float viewmat[4][4], float winmat[4][4]) RET_NONE
|
||||
void ED_view3d_update_viewmat(struct Scene *scene, struct View3D *v3d, struct ARegion *ar, float viewmat[4][4], float winmat[4][4], const struct rcti *rect) RET_NONE
|
||||
float ED_view3d_grid_scale(struct Scene *scene, struct View3D *v3d, const char **grid_unit) RET_ZERO
|
||||
void ED_view3d_shade_update(struct Main *bmain, struct Scene *scene, struct View3D *v3d, struct ScrArea *sa) RET_NONE
|
||||
void ED_node_shader_default(const struct bContext *C, struct ID *id) RET_NONE
|
||||
|
Loading…
Reference in New Issue
Block a user