[Bf-blender-cvs] [3a49c928c14] soc-2021-curves: Fix formatting changes due to auto format
dilithjay
noreply at git.blender.org
Sat Jul 24 19:12:04 CEST 2021
Commit: 3a49c928c1498393c5bf53a72759d998f7d0101e
Author: dilithjay
Date: Sat Jul 24 22:40:42 2021 +0530
Branches: soc-2021-curves
https://developer.blender.org/rB3a49c928c1498393c5bf53a72759d998f7d0101e
Fix formatting changes due to auto format
===================================================================
M release/scripts/modules/rna_manual_reference.py
M release/scripts/startup/bl_operators/assets.py
M release/scripts/startup/bl_ui/properties_collection.py
M release/scripts/startup/bl_ui/properties_material.py
M release/scripts/startup/bl_ui/space_spreadsheet.py
M source/blender/blenkernel/BKE_mesh_types.h
M source/blender/blenkernel/intern/displist.cc
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenlib/tests/BLI_delaunay_2d_test.cc
M source/blender/bmesh/intern/bmesh_marking.c
M source/blender/compositor/intern/COM_FullFrameExecutionModel.cc
M source/blender/compositor/operations/COM_SMAAOperation.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/eval/deg_eval_flush.cc
M source/blender/depsgraph/intern/node/deg_node_operation.h
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/editors/transform/transform_convert_mesh.c
M source/blender/imbuf/IMB_imbuf.h
M source/blender/makesdna/DNA_ID.h
M source/blender/makesdna/DNA_sequence_types.h
M source/blender/sequencer/CMakeLists.txt
M source/blender/sequencer/SEQ_sequencer.h
M source/blender/sequencer/SEQ_transform.h
===================================================================
diff --git a/release/scripts/modules/rna_manual_reference.py b/release/scripts/modules/rna_manual_reference.py
index a6b183fdbfb..f9756811bde 100644
--- a/release/scripts/modules/rna_manual_reference.py
+++ b/release/scripts/modules/rna_manual_reference.py
@@ -15,29 +15,28 @@ if language == 'DEFAULT':
language = os.getenv('LANG', '').split('.')[0]
LANG = {
- "ar_EG": "ar",
- "de_DE": "de",
- "es": "es",
- "fi_FI": "fi",
- "fr_FR": "fr",
- "id_ID": "id",
- "it_IT": "it",
- "ja_JP": "ja",
- "ko_KR": "ko",
- "pt_PT": "pt",
- "pt_BR": "pt",
- "ru_RU": "ru",
- "sk_SK": "sk",
- "sr_RS": "sr",
- "uk_UA": "uk",
- "vi_VN": "vi",
- "zh_CN": "zh-hans",
- "zh_TW": "zh-hant",
+"ar_EG": "ar",
+"de_DE": "de",
+"es": "es",
+"fi_FI": "fi",
+"fr_FR": "fr",
+"id_ID": "id",
+"it_IT": "it",
+"ja_JP": "ja",
+"ko_KR": "ko",
+"pt_PT": "pt",
+"pt_BR": "pt",
+"ru_RU": "ru",
+"sk_SK": "sk",
+"sr_RS": "sr",
+"uk_UA": "uk",
+"vi_VN": "vi",
+"zh_CN": "zh-hans",
+"zh_TW": "zh-hant",
}.get(language)
if LANG is not None:
- url_manual_prefix = url_manual_prefix.replace(
- "manual/en", "manual/" + LANG)
+ url_manual_prefix = url_manual_prefix.replace("manual/en", "manual/" + LANG)
url_manual_mapping = (
("bpy.types.movietrackingsettings.refine_intrinsics_tangential_distortion*", "movie_clip/tracking/clip/toolbar/solve.html#bpy-types-movietrackingsettings-refine-intrinsics-tangential-distortion"),
diff --git a/release/scripts/startup/bl_operators/assets.py b/release/scripts/startup/bl_operators/assets.py
index 7141f4bc015..c782cd0646e 100644
--- a/release/scripts/startup/bl_operators/assets.py
+++ b/release/scripts/startup/bl_operators/assets.py
@@ -94,8 +94,7 @@ class ASSET_OT_open_containing_blend_file(Operator):
cls.poll_message_set("No asset selected")
return False
if asset_file_handle.local_id:
- cls.poll_message_set(
- "Selected asset is contained in the current file")
+ cls.poll_message_set("Selected asset is contained in the current file")
return False
return True
@@ -104,12 +103,10 @@ class ASSET_OT_open_containing_blend_file(Operator):
asset_library = context.asset_library
if asset_file_handle.local_id:
- self.report(
- {'WARNING'}, "This asset is stored in the current blend file")
+ self.report({'WARNING'}, "This asset is stored in the current blend file")
return {'CANCELLED'}
- asset_lib_path = bpy.types.AssetHandle.get_full_library_path(
- asset_file_handle, asset_library)
+ asset_lib_path = bpy.types.AssetHandle.get_full_library_path(asset_file_handle, asset_library)
self.open_in_new_blender(asset_lib_path)
wm = context.window_manager
@@ -133,8 +130,7 @@ class ASSET_OT_open_containing_blend_file(Operator):
return {'RUNNING_MODAL'}
if returncode:
- self.report(
- {'WARNING'}, "Blender subprocess exited with error code %d" % returncode)
+ self.report({'WARNING'}, "Blender subprocess exited with error code %d" % returncode)
# TODO(Sybren): Replace this with a generic "reload assets" operator
# that can run outside of the Asset Browser context.
diff --git a/release/scripts/startup/bl_ui/properties_collection.py b/release/scripts/startup/bl_ui/properties_collection.py
index 9b50dec5a57..3f7c0735eec 100644
--- a/release/scripts/startup/bl_ui/properties_collection.py
+++ b/release/scripts/startup/bl_ui/properties_collection.py
@@ -52,8 +52,7 @@ class COLLECTION_PT_collection_flags(CollectionButtonsPanel, Panel):
vlc = vl.active_layer_collection
col = layout.column(align=True)
- col.prop(collection, "hide_select", text="Selectable",
- toggle=False, invert_checkbox=True)
+ col.prop(collection, "hide_select", text="Selectable", toggle=False, invert_checkbox=True)
col.prop(collection, "hide_render", toggle=False)
col = layout.column(align=True)
diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py
index 6e22bde5fe1..1c7f3639f0a 100644
--- a/release/scripts/startup/bl_ui/properties_material.py
+++ b/release/scripts/startup/bl_ui/properties_material.py
@@ -114,8 +114,7 @@ class EEVEE_MATERIAL_PT_context_material(MaterialButtonsPanel, Panel):
row = layout.row()
- row.template_list("MATERIAL_UL_matslots", "", ob,
- "material_slots", ob, "active_material_index", rows=rows)
+ row.template_list("MATERIAL_UL_matslots", "", ob, "material_slots", ob, "active_material_index", rows=rows)
col = row.column(align=True)
col.operator("object.material_slot_add", icon='ADD', text="")
@@ -128,10 +127,8 @@ class EEVEE_MATERIAL_PT_context_material(MaterialButtonsPanel, Panel):
if is_sortable:
col.separator()
- col.operator("object.material_slot_move",
- icon='TRIA_UP', text="").direction = 'UP'
- col.operator("object.material_slot_move",
- icon='TRIA_DOWN', text="").direction = 'DOWN'
+ col.operator("object.material_slot_move", icon='TRIA_UP', text="").direction = 'UP'
+ col.operator("object.material_slot_move", icon='TRIA_DOWN', text="").direction = 'DOWN'
row = layout.row()
@@ -181,8 +178,7 @@ class EEVEE_MATERIAL_PT_surface(MaterialButtonsPanel, Panel):
layout.use_property_split = True
if mat.use_nodes:
- panel_node_draw(layout, mat.node_tree,
- 'OUTPUT_MATERIAL', "Surface")
+ panel_node_draw(layout, mat.node_tree, 'OUTPUT_MATERIAL', "Surface")
else:
layout.prop(mat, "diffuse_color", text="Base Color")
layout.prop(mat, "metallic")
@@ -224,8 +220,7 @@ def draw_material_settings(self, context):
layout.prop(mat, "shadow_method")
row = layout.row()
- row.active = ((mat.blend_method == 'CLIP')
- or (mat.shadow_method == 'CLIP'))
+ row.active = ((mat.blend_method == 'CLIP') or (mat.shadow_method == 'CLIP'))
row.prop(mat, "alpha_threshold")
if mat.blend_method not in {'OPAQUE', 'CLIP', 'HASHED'}:
diff --git a/release/scripts/startup/bl_ui/space_spreadsheet.py b/release/scripts/startup/bl_ui/space_spreadsheet.py
index ba928978254..afdbfea5091 100644
--- a/release/scripts/startup/bl_ui/space_spreadsheet.py
+++ b/release/scripts/startup/bl_ui/space_spreadsheet.py
@@ -123,4 +123,4 @@ classes = (
if __name__ == "__main__": # Only for live edit.
from bpy.utils import register_class
for cls in classes:
- register_class(cls)
\ No newline at end of file
+ register_class(cls)
diff --git a/source/blender/blenkernel/BKE_mesh_types.h b/source/blender/blenkernel/BKE_mesh_types.h
index 18a45c70e78..aed8c44a031 100644
--- a/source/blender/blenkernel/BKE_mesh_types.h
+++ b/source/blender/blenkernel/BKE_mesh_types.h
@@ -29,4 +29,4 @@ typedef enum eMeshBatchDirtyMode {
BKE_MESH_BATCH_DIRTY_SHADING,
BKE_MESH_BATCH_DIRTY_UVEDIT_ALL,
BKE_MESH_BATCH_DIRTY_UVEDIT_SELECT,
-} eMeshBatchDirtyMode;
\ No newline at end of file
+} eMeshBatchDirtyMode;
diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc
index 87d9ea0994e..a4ffaa8b10b 100644
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@@ -1708,4 +1708,4 @@ static void boundbox_displist_object(Object *ob)
ob->runtime.bb->flag &= ~BOUNDBOX_DIRTY;
}
}
-}
\ No newline at end of file
+}
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 7e745022921..8d74002ad79 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -2179,4 +2179,4 @@ void BKE_mesh_eval_geometry(Depsgraph *depsgraph, Mesh *mesh)
copy_v3_v3(mesh_orig->size, mesh->size);
}
}
-}
\ No newline at end of file
+}
diff --git a/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc b/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc
index 1e43bc2ea13..f221036419e 100644
--- a/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc
+++ b/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc
@@ -2377,4 +2377,4 @@ TEST(delaunay_m, RandomTrisCircleB)
#endif
-} // namespace blender::meshintersect
\ No newline at end of file
+} // namespace blender::meshintersect
diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c
index 32f90418b38..b70e26f51ea 100644
--- a/source/blender/bmesh/intern/bmesh_marking.c
+++ b/source/blender/bmesh/intern/bmesh_marking.c
@@ -1573,4 +1573,4 @@ void _bm_elem_hide_set(BMesh *bm, BMHeader *head, const bool hide)
BMESH_ASSERT(0);
break;
}
-}
\ No newline at end of file
+}
diff --git a/source/blender/compositor/intern/COM_FullFrameExecutionModel.cc b/source/blender/compositor/intern/COM_FullFrameExecutionModel.cc
index 97b9d85760d..bd3a481d691 100644
--- a/source/blender/compositor/intern/COM_FullFrameExecutionModel.cc
+++ b/source/blender/compositor/intern/COM_FullFrameExecutionModel.cc
@@ -110,7 +110,6 @@ void FullFrameExecutionModel::render_operation(NodeOperation *op)
* TranslateOperation from convert resolutions if linked to an operation with resolution. */
active_buffers_.set_rendered_buffer(op, std::unique_ptr<MemoryBuffer>(op_buf));
- DebugInfo::operation_rendered(op, op_buf);
operation_finished(op);
}
diff --git a/source/blender/compositor/operations/COM_SMAAOperation.cc b/source/blender/compositor/operations/COM_SMAAOperation.cc
index b3b38436ff7..b078d85372d 100644
--- a/source/blender/compos
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list