[Bf-blender-cvs] [feeb8310c80] master: Cleanup: format
Campbell Barton
noreply at git.blender.org
Thu Jun 30 04:15:23 CEST 2022
Commit: feeb8310c80ec991d1dd060737dc30f3e1cff93a
Author: Campbell Barton
Date: Thu Jun 30 12:14:23 2022 +1000
Branches: master
https://developer.blender.org/rBfeeb8310c80ec991d1dd060737dc30f3e1cff93a
Cleanup: format
===================================================================
M build_files/build_environment/cmake/download.cmake
M build_files/build_environment/cmake/dpcpp_deps.cmake
M build_files/build_environment/cmake/gmmlib.cmake
M build_files/build_environment/cmake/igc.cmake
M intern/cycles/blender/addon/properties.py
M intern/cycles/blender/addon/ui.py
M source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
M tests/performance/tests/eevee.py
===================================================================
diff --git a/build_files/build_environment/cmake/download.cmake b/build_files/build_environment/cmake/download.cmake
index 8b210992ada..b7150525a65 100644
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -116,4 +116,3 @@ download_source(IGC_SPIRV_TOOLS)
download_source(IGC_SPIRV_TRANSLATOR)
download_source(GMMLIB)
download_source(OCLOC)
-
diff --git a/build_files/build_environment/cmake/dpcpp_deps.cmake b/build_files/build_environment/cmake/dpcpp_deps.cmake
index 17cb9de3bf7..e66006993f6 100644
--- a/build_files/build_environment/cmake/dpcpp_deps.cmake
+++ b/build_files/build_environment/cmake/dpcpp_deps.cmake
@@ -59,4 +59,3 @@ ExternalProject_Add(external_spirvheaders
BUILD_COMMAND echo .
INSTALL_COMMAND echo .
)
-
diff --git a/build_files/build_environment/cmake/gmmlib.cmake b/build_files/build_environment/cmake/gmmlib.cmake
index d3ddfd39ac6..c46f5c8943d 100644
--- a/build_files/build_environment/cmake/gmmlib.cmake
+++ b/build_files/build_environment/cmake/gmmlib.cmake
@@ -11,4 +11,3 @@ ExternalProject_Add(external_gmmlib
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/gmmlib ${DEFAULT_CMAKE_FLAGS} ${GMMLIB_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/gmmlib
)
-
diff --git a/build_files/build_environment/cmake/igc.cmake b/build_files/build_environment/cmake/igc.cmake
index 64f30064a3a..3b488a77b3f 100644
--- a/build_files/build_environment/cmake/igc.cmake
+++ b/build_files/build_environment/cmake/igc.cmake
@@ -7,7 +7,7 @@ unpack_only(igc_spirv_tools)
#
# igc_opencl_clang contains patches that need to be applied
# to external_igc_llvm and igc_spirv_translator, we unpack
-# igc_opencl_clang first, then have the patch stages of
+# igc_opencl_clang first, then have the patch stages of
# external_igc_llvm and igc_spirv_translator apply them.
#
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 7d7ca78c15a..c41e1f02b75 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -1568,11 +1568,12 @@ class CyclesPreferences(bpy.types.AddonPreferences):
for device in devices:
import unicodedata
- box.prop(device, "use", text=device.name
- .replace('(TM)', unicodedata.lookup('TRADE MARK SIGN'))
- .replace('(R)', unicodedata.lookup('REGISTERED SIGN'))
- .replace('(C)', unicodedata.lookup('COPYRIGHT SIGN'))
- )
+ box.prop(
+ device, "use", text=device.name
+ .replace('(TM)', unicodedata.lookup('TRADE MARK SIGN'))
+ .replace('(R)', unicodedata.lookup('REGISTERED SIGN'))
+ .replace('(C)', unicodedata.lookup('COPYRIGHT SIGN'))
+ )
def draw_impl(self, layout, context):
row = layout.row()
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 5b8c3960c82..77da3f36685 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -110,11 +110,13 @@ def use_optix(context):
return (get_device_type(context) == 'OPTIX' and cscene.device == 'GPU')
+
def use_oneapi(context):
cscene = context.scene.cycles
return (get_device_type(context) == 'ONEAPI' and cscene.device == 'GPU')
+
def use_multi_device(context):
cscene = context.scene.cycles
if cscene.device != 'GPU':
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
index 4ee18c6738f..988698771bf 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
@@ -1338,4 +1338,4 @@ void MOD_lineart_chain_find_silhouette_backdrop_objects(LineartData *ld)
ec->silhouette_backdrop = eln->object_ref;
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/performance/tests/eevee.py b/tests/performance/tests/eevee.py
index e1da5e423c5..df7cac695da 100644
--- a/tests/performance/tests/eevee.py
+++ b/tests/performance/tests/eevee.py
@@ -29,10 +29,10 @@ def _run(args):
bpy.app.handlers.frame_change_post.append(frame_change_handler)
bpy.ops.screen.animation_play()
-
+
def frame_change_handler(scene):
import bpy
-
+
global record_stage
global start_time
global start_record_time
@@ -40,7 +40,7 @@ def frame_change_handler(scene):
global warmup_frame
global stop_record_time
global playback_iteration
-
+
if record_stage == RecordStage.INIT:
screen = bpy.context.window_manager.windows[0].screen
bpy.context.scene.sync_mode = 'NONE'
@@ -50,10 +50,10 @@ def frame_change_handler(scene):
space = area.spaces[0]
space.shading.type = 'RENDERED'
space.overlay.show_overlays = False
-
+
start_time = time.perf_counter()
record_stage = RecordStage.WAIT_SHADERS
-
+
elif record_stage == RecordStage.WAIT_SHADERS:
shaders_compiled = False
if hasattr(bpy.app, 'is_job_running'):
@@ -61,12 +61,12 @@ def frame_change_handler(scene):
else:
# Fallback when is_job_running doesn't exists by waiting for a time.
shaders_compiled = time.perf_counter() - start_time > SHADER_FALLBACK_SECONDS
-
+
if shaders_compiled:
start_warmup_time = time.perf_counter()
warmup_frame = 0
record_stage = RecordStage.WARMUP
-
+
elif record_stage == RecordStage.WARMUP:
warmup_frame += 1
if time.perf_counter() - start_warmup_time > WARMUP_SECONDS and warmup_frame > WARMUP_FRAMES:
@@ -75,13 +75,13 @@ def frame_change_handler(scene):
scene = bpy.context.scene
scene.frame_set(scene.frame_start)
record_stage = RecordStage.RECORD
-
+
elif record_stage == RecordStage.RECORD:
current_time = time.perf_counter()
scene = bpy.context.scene
if scene.frame_current == scene.frame_end:
playback_iteration += 1
-
+
if playback_iteration >= RECORD_PLAYBACK_ITER:
stop_record_time = current_time
record_stage = RecordStage.FINISHED
@@ -95,13 +95,14 @@ def frame_change_handler(scene):
print(f"{LOG_KEY}{{'time': {avg_frame_time}, 'fps': {fps} }}")
bpy.app.handlers.frame_change_post.remove(frame_change_handler)
bpy.ops.wm.quit_blender()
-
+
if __name__ == '__main__':
_run(None)
-
+
else:
import api
+
class EeveeTest(api.Test):
def __init__(self, filepath):
self.filepath = filepath
@@ -123,7 +124,6 @@ else:
raise Exception("No playback performance result found in log.")
-
def generate(env):
filepaths = env.find_blend_files('eevee/*')
- return [EeveeTest(filepath) for filepath in filepaths]
\ No newline at end of file
+ return [EeveeTest(filepath) for filepath in filepaths]
More information about the Bf-blender-cvs
mailing list