diff options
| -rw-r--r-- | intern/cycles/kernel/kernel_id_passes.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_passes.h | 2 | ||||
| -rw-r--r-- | intern/cycles/render/shader.cpp | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_dopesheet.py | 6 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 3 | ||||
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_draw_utils.c | 4 | ||||
| -rw-r--r-- | source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_draw.c | 6 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_state.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
11 files changed, 17 insertions, 16 deletions
diff --git a/intern/cycles/kernel/kernel_id_passes.h b/intern/cycles/kernel/kernel_id_passes.h index 486c61d2ae5..8d092374d8b 100644 --- a/intern/cycles/kernel/kernel_id_passes.h +++ b/intern/cycles/kernel/kernel_id_passes.h @@ -22,7 +22,7 @@ ccl_device_inline void kernel_write_id_slots(ccl_global float *buffer, int num_s if(weight == 0.0f) { return; } - + for(int slot = 0; slot < num_slots; slot++) { ccl_global float2 *id_buffer = (ccl_global float2*)buffer; #ifdef __ATOMIC_PASS_WRITE__ diff --git a/intern/cycles/kernel/kernel_passes.h b/intern/cycles/kernel/kernel_passes.h index e256a1819ed..49a1b2c848e 100644 --- a/intern/cycles/kernel/kernel_passes.h +++ b/intern/cycles/kernel/kernel_passes.h @@ -200,7 +200,7 @@ ccl_device_inline size_t kernel_write_id_pass_cpu(float *buffer, size_t depth, f return 0; } #else /* __KERNEL_CPU__ */ -#define WRITE_ID_SLOT(buffer, depth, id, matte_weight, name) kernel_write_id_slots_gpu(buffer, depth * 2, id, matte_weight) +#define WRITE_ID_SLOT(buffer, depth, id, matte_weight, name) kernel_write_id_slots_gpu(buffer, depth * 2, id, matte_weight) ccl_device_inline size_t kernel_write_id_slots_gpu(ccl_global float *buffer, size_t depth, float id, float matte_weight) { #endif /* __KERNEL_CPU__ */ diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index 13075a1ee2c..4fce4b79f49 100644 --- a/intern/cycles/render/shader.cpp +++ b/intern/cycles/render/shader.cpp @@ -526,7 +526,7 @@ void ShaderManager::device_update_common(Device *device, flag |= SD_HAS_CONSTANT_EMISSION; uint32_t cryptomatte_id = util_murmur_hash3(shader->name.c_str(), shader->name.length(), 0); - + /* regular shader */ kshader->flags = flag; kshader->pass_id = shader->pass_id; diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index fb8a59097d6..bc1940782bd 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -150,7 +150,7 @@ class DopesheetFilterPopoverBase: flow.prop(dopesheet, "show_shapekeys", text="Shape Keys") layout.separator() - + # Object Data Filters # TODO: Add per-channel/axis convenience toggles? @@ -158,10 +158,10 @@ class DopesheetFilterPopoverBase: col = split.column() col.prop(dopesheet, "show_transforms", text="Transforms") - + col = split.column() col.prop(dopesheet, "show_modifiers", text="Modifiers") - + layout.separator() # performance-related options (users will mostly have these enabled) diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 56e91729d0e..7243cb5b522 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -2244,7 +2244,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) for (Material *mat = bmain->mat.first; mat; mat = mat->id.next) { if (mat->gp_style) { if (((mat->gp_style->flag & GP_STYLE_STROKE_SHOW) == 0) && - ((mat->gp_style->flag & GP_STYLE_FILL_SHOW) == 0)) { + ((mat->gp_style->flag & GP_STYLE_FILL_SHOW) == 0)) + { mat->gp_style->flag |= GP_STYLE_STROKE_SHOW; mat->gp_style->flag |= GP_STYLE_FILL_SHOW; } diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c index b12f6d2229b..abf1940ad4a 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c @@ -837,7 +837,7 @@ static void gpencil_draw_strokes( if ((gps->totpoints > 2) && (!stl->storage->simplify_fill) && ((gp_style->fill_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH) || (gp_style->fill_style > 0)) && ((gps->flag & GP_STROKE_NOFILL) == 0) && - (gp_style->flag & GP_STYLE_FILL_SHOW)) + (gp_style->flag & GP_STYLE_FILL_SHOW)) { stl->shgroups[id].shgrps_fill = DRW_gpencil_shgroup_fill_create( e_data, vedata, psl->stroke_pass, e_data->gpencil_fill_sh, gpd, gp_style, id); @@ -985,7 +985,7 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, void *vedata, T (gpd->runtime.sfill[3] > GPENCIL_ALPHA_OPACITY_THRESH) && ((gpd->runtime.sbuffer_sflag & GP_STROKE_NOFILL) == 0) && ((brush->gpencil_settings->flag & GP_BRUSH_DISSABLE_LASSO) == 0) && - (gp_style->flag & GP_STYLE_FILL_SHOW)) + (gp_style->flag & GP_STYLE_FILL_SHOW)) { /* if not solid, fill is simulated with solid color */ if (gpd->runtime.bfill_style > 0) { diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl index 439642f52e5..db973056110 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl @@ -46,6 +46,6 @@ void main() /* mult both alpha factor to use strength factor with color alpha limit */ fragColor.a = min(text_color.a * mColor.a, mColor.a); } - if(fragColor.a < 0.0035) + if(fragColor.a < 0.0035) discard; } diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl index 205b7a7fe64..9a82e871f56 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl @@ -44,6 +44,6 @@ void main() fragColor.a = min(text_color.a * tColor.a, tColor.a); } - if(fragColor.a < 0.0035) + if(fragColor.a < 0.0035) discard; } diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index d696dbd0d88..68058292c44 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -1795,7 +1795,7 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, const rcti /* curve */ for (int a = 0; a <= CM_TABLE; a++) { fx = rect->xmin + zoomx * (cmp[a].x - offsx); - fy = rect->ymin + zoomy * (cmp[a].y - offsy); + fy = rect->ymin + zoomy * (cmp[a].y - offsy); immVertex2f(pos, fx, rect->ymin); immVertex2f(pos, fx, fy); } @@ -1831,8 +1831,8 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, const rcti UI_GetThemeColor4fv(TH_TEXT_HI, color); else UI_GetThemeColor4fv(TH_TEXT, color); - float fx = rect->xmin + zoomx * (cmp[a].x - offsx); - float fy = rect->ymin + zoomy * (cmp[a].y - offsy); + fx = rect->xmin + zoomx * (cmp[a].x - offsx); + fy = rect->ymin + zoomy * (cmp[a].y - offsy); immAttr4fv(col, color); immVertex2f(pos, fx, fy); } diff --git a/source/blender/gpu/intern/gpu_state.c b/source/blender/gpu/intern/gpu_state.c index afc8570356b..d06854f669f 100644 --- a/source/blender/gpu/intern/gpu_state.c +++ b/source/blender/gpu/intern/gpu_state.c @@ -176,4 +176,4 @@ void GPU_flush(void) void GPU_finish(void) { glFinish(); -}
\ No newline at end of file +} diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index e5efdbc2054..b57156bcc97 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2235,7 +2235,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) {GP_PROJECT_DEPTH_STROKE_FIRST, "FIRST", 0, "First point", "Snap to first point" }, {0, NULL, 0, NULL, NULL} }; - + static const EnumPropertyItem gpencil_selectmode_items[] = { {GP_SELECTMODE_POINT, "POINT", ICON_GP_SELECT_POINTS, "Point", "Select only points"}, {GP_SELECTMODE_STROKE, "STROKE", ICON_GP_SELECT_STROKES, "Stroke", "Select all stroke points" }, |