archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: format

Browse Source
This commit is contained in:
Campbell Barton
2022-05-18 12:17:42 +10:00
parent c38187393a
commit ffbeb34f5f
8 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/python_api/examples/bpy.types.Image.py
View File

@@ -44,4 +44,3 @@ image_dest = image_src.copy()
image_dest.update() image_dest.update()
print(image_dest.size) print(image_dest.size)
print(image_dest.pixels[0:4]) print(image_dest.pixels[0:4])

13
intern/cycles/kernel/integrator/mnee.h
View File

@@ -534,14 +534,8 @@ ccl_device_forceinline bool mnee_newton_solver(KernelGlobals kg,
tv.dp_dv = mv.dp_dv; tv.dp_dv = mv.dp_dv;
/* Setup corrected manifold vertex. */ /* Setup corrected manifold vertex. */
mnee_setup_manifold_vertex(kg, mnee_setup_manifold_vertex(
&tv, kg, &tv, mv.bsdf, mv.eta, mv.n_offset, &projection_ray, &projection_isect, sd_vtx);
mv.bsdf,
mv.eta,
mv.n_offset,
&projection_ray,
&projection_isect,
sd_vtx);
/* Fail newton solve if we are not making progress, probably stuck trying to move off the /* Fail newton solve if we are not making progress, probably stuck trying to move off the
* edge of the mesh. */ * edge of the mesh. */
@@ -1038,8 +1032,7 @@ ccl_device_forceinline int kernel_path_mnee_sample(KernelGlobals kg,
} }
/* Setup differential geometry on vertex. */ /* Setup differential geometry on vertex. */
mnee_setup_manifold_vertex( mnee_setup_manifold_vertex(kg, &mv, bsdf, eta, h, &probe_ray, &probe_isect, sd_mnee);
kg, &mv, bsdf, eta, h, &probe_ray, &probe_isect, sd_mnee);
break; break;
} }
} }

1
source/blender/gpu/intern/gpu_capabilities.cc
View File

@@ -172,7 +172,6 @@ int GPU_max_compute_shader_storage_blocks()
return GCaps.max_compute_shader_storage_blocks; return GCaps.max_compute_shader_storage_blocks;
} }
/** \} */ /** \} */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */

2
source/blender/io/common/IO_path_util.hh
View File

@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
#pragma once #pragma once
#include "BLI_string_ref.hh"
#include "BLI_set.hh" #include "BLI_set.hh"
#include "BLI_string_ref.hh"
#include "IO_path_util_types.h" #include "IO_path_util_types.h"

3
source/blender/io/common/intern/path_util.cc
View File

@@ -28,7 +28,8 @@ std::string path_reference(StringRefNull filepath,
} }
else if (mode == PATH_REFERENCE_COPY) { else if (mode == PATH_REFERENCE_COPY) {
char filepath_cpy[PATH_MAX]; char filepath_cpy[PATH_MAX];
BLI_path_join(filepath_cpy, PATH_MAX, base_dst.c_str(), BLI_path_basename(filepath_abs), nullptr); BLI_path_join(
filepath_cpy, PATH_MAX, base_dst.c_str(), BLI_path_basename(filepath_abs), nullptr);
copy_set->add(std::make_pair(filepath_abs, filepath_cpy)); copy_set->add(std::make_pair(filepath_abs, filepath_cpy));
BLI_strncpy(filepath_abs, filepath_cpy, PATH_MAX); BLI_strncpy(filepath_abs, filepath_cpy, PATH_MAX);
mode = PATH_REFERENCE_RELATIVE; mode = PATH_REFERENCE_RELATIVE;

3
source/blender/makesrna/intern/rna_userdef.c
View File

@@ -6410,7 +6410,8 @@ static void rna_def_userdef_experimental(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_draw_manager_acquire_lock", PROP_BOOLEAN, PROP_NONE); prop = RNA_def_property(srna, "use_draw_manager_acquire_lock", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "use_draw_manager_acquire_lock", 1); RNA_def_property_boolean_sdna(prop, NULL, "use_draw_manager_acquire_lock", 1);
RNA_def_property_ui_text(prop, "Draw Manager Locking", "Don't lock UI during background rendering"); RNA_def_property_ui_text(
prop, "Draw Manager Locking", "Don't lock UI during background rendering");
prop = RNA_def_property(srna, "use_extended_asset_browser", PROP_BOOLEAN, PROP_NONE); prop = RNA_def_property(srna, "use_extended_asset_browser", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_ui_text(prop, RNA_def_property_ui_text(prop,