Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: format

Browse Source
This commit is contained in:
Campbell Barton
2022-05-05 17:32:57 +10:00
parent 6513ce258f
commit eb837ba17e
6 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/osl/shaders/node_combine_color.osl
View File

@@ -3,7 +3,11 @@
#include "stdcycles.h" #include "stdcycles.h"
shader node_combine_color(string color_type = "rgb", float Red = 0.0, float Green = 0.0, float Blue = 0.0, output color Color = 0.8) shader node_combine_color(string color_type = "rgb",
float Red = 0.0,
float Green = 0.0,
float Blue = 0.0,
output color Color = 0.8)
{ {
if (color_type == "rgb" || color_type == "hsv" || color_type == "hsl") if (color_type == "rgb" || color_type == "hsv" || color_type == "hsl")
Color = color(color_type, Red, Green, Blue); Color = color(color_type, Red, Green, Blue);

8
intern/cycles/kernel/osl/shaders/node_separate_color.osl
View File

@@ -5,10 +5,10 @@
#include "stdcycles.h" #include "stdcycles.h"
shader node_separate_color(string color_type = "rgb", shader node_separate_color(string color_type = "rgb",
color Color = 0.8, color Color = 0.8,
output float Red = 0.0, output float Red = 0.0,
output float Green = 0.0, output float Green = 0.0,
output float Blue = 0.0) output float Blue = 0.0)
{ {
color col; color col;
if (color_type == "rgb") if (color_type == "rgb")

23
intern/cycles/kernel/svm/sepcomb_color.h
View File

@@ -6,14 +6,15 @@
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN
ccl_device_noinline void svm_node_combine_color(KernelGlobals kg, ccl_device_noinline void svm_node_combine_color(KernelGlobals kg,
ccl_private ShaderData *sd, ccl_private ShaderData *sd,
ccl_private float *stack, ccl_private float *stack,
uint color_type, uint color_type,
uint inputs_stack_offsets, uint inputs_stack_offsets,
uint result_stack_offset) uint result_stack_offset)
{ {
uint red_stack_offset, green_stack_offset, blue_stack_offset; uint red_stack_offset, green_stack_offset, blue_stack_offset;
svm_unpack_node_uchar3(inputs_stack_offsets, &red_stack_offset, &green_stack_offset, &blue_stack_offset); svm_unpack_node_uchar3(
inputs_stack_offsets, &red_stack_offset, &green_stack_offset, &blue_stack_offset);
float r = stack_load_float(stack, red_stack_offset); float r = stack_load_float(stack, red_stack_offset);
float g = stack_load_float(stack, green_stack_offset); float g = stack_load_float(stack, green_stack_offset);
@@ -27,11 +28,11 @@ ccl_device_noinline void svm_node_combine_color(KernelGlobals kg,
} }
ccl_device_noinline void svm_node_separate_color(KernelGlobals kg, ccl_device_noinline void svm_node_separate_color(KernelGlobals kg,
ccl_private ShaderData *sd, ccl_private ShaderData *sd,
ccl_private float *stack, ccl_private float *stack,
uint color_type, uint color_type,
uint input_stack_offset, uint input_stack_offset,
uint results_stack_offsets) uint results_stack_offsets)
{ {
float3 color = stack_load_float3(stack, input_stack_offset); float3 color = stack_load_float3(stack, input_stack_offset);

3
intern/cycles/util/color.h
View File

@@ -162,7 +162,8 @@ ccl_device float3 rgb_to_hsl(float3 rgb)
if (cmax == cmin) { if (cmax == cmin) {
h = s = 0.0f; /* achromatic */ h = s = 0.0f; /* achromatic */
} else { }
else {
float cdelta = cmax - cmin; float cdelta = cmax - cmin;
s = l > 0.5f ? cdelta / (2.0f - cmax - cmin) : cdelta / (cmax + cmin); s = l > 0.5f ? cdelta / (2.0f - cmax - cmin) : cdelta / (cmax + cmin);
if (cmax == rgb.x) { if (cmax == rgb.x) {

3
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@@ -1048,6 +1048,7 @@ class VIEW3D_PT_sculpt_symmetry_for_topbar(Panel):
draw = VIEW3D_PT_sculpt_symmetry.draw draw = VIEW3D_PT_sculpt_symmetry.draw
class VIEW3D_PT_curves_sculpt_symmetry(Panel, View3DPaintPanel): class VIEW3D_PT_curves_sculpt_symmetry(Panel, View3DPaintPanel):
bl_context = ".curves_sculpt" # dot on purpose (access from topbar) bl_context = ".curves_sculpt" # dot on purpose (access from topbar)
bl_label = "Symmetry" bl_label = "Symmetry"
@@ -1069,6 +1070,7 @@ class VIEW3D_PT_curves_sculpt_symmetry(Panel, View3DPaintPanel):
row.prop(curves, "use_mirror_y", text="Y", toggle=True) row.prop(curves, "use_mirror_y", text="Y", toggle=True)
row.prop(curves, "use_mirror_z", text="Z", toggle=True) row.prop(curves, "use_mirror_z", text="Z", toggle=True)
class VIEW3D_PT_curves_sculpt_symmetry_for_topbar(Panel): class VIEW3D_PT_curves_sculpt_symmetry_for_topbar(Panel):
bl_space_type = 'TOPBAR' bl_space_type = 'TOPBAR'
bl_region_type = 'HEADER' bl_region_type = 'HEADER'
@@ -1077,7 +1079,6 @@ class VIEW3D_PT_curves_sculpt_symmetry_for_topbar(Panel):
draw = VIEW3D_PT_curves_sculpt_symmetry.draw draw = VIEW3D_PT_curves_sculpt_symmetry.draw
# ********** default tools for weight-paint **************** # ********** default tools for weight-paint ****************

2
source/blender/imbuf/intern/thumbs.c
View File

@@ -318,7 +318,7 @@ static ImBuf *thumb_create_ex(const char *file_path,
char tpath[FILE_MAX]; char tpath[FILE_MAX];
char tdir[FILE_MAX]; char tdir[FILE_MAX];
char temp[FILE_MAX]; char temp[FILE_MAX];
char mtime[40] = "0"; /* in case we can't stat the file */ char mtime[40] = "0"; /* in case we can't stat the file */
short tsize = 128; short tsize = 128;
BLI_stat_t info; BLI_stat_t info;