Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--release/scripts/startup/bl_ui/space_node.py2
-rw-r--r--release/scripts/startup/bl_ui/space_sequencer.py6
-rw-r--r--release/scripts/startup/bl_ui/space_spreadsheet.py4
-rw-r--r--source/blender/blenlib/BLI_virtual_array.hh2
-rw-r--r--source/blender/blenloader/intern/versioning_290.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index b6fbb840fab..a85dd70e8f4 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -163,7 +163,7 @@ class NODE_HT_header(Header):
row.template_ID(snode, "node_tree", new="node.new_geometry_node_group_assign")
elif ob:
active_modifier = ob.modifiers.active
- if active_modifier and active_modifier.type == "NODES":
+ if active_modifier and active_modifier.type == 'NODES':
if active_modifier.node_group:
row.template_ID(active_modifier, "node_group", new="node.copy_geometry_node_group_assign")
else:
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index e3cb316e8fc..063d8f9184f 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -1282,8 +1282,8 @@ class SEQUENCER_PT_effect_text_style(SequencerButtonsPanel, Panel):
row = col.row(align=True)
row.use_property_decorate = False
row.template_ID(strip, "font", open="font.open", unlink="font.unlink")
- row.prop(strip, "use_bold", text="", icon="BOLD")
- row.prop(strip, "use_italic", text="", icon="ITALIC")
+ row.prop(strip, "use_bold", text="", icon='BOLD')
+ row.prop(strip, "use_italic", text="", icon='ITALIC')
col.prop(strip, "font_size")
col.prop(strip, "color")
@@ -2016,7 +2016,7 @@ class SEQUENCER_PT_view(SequencerButtonsPanel_Output, Panel):
col = layout.column()
prop = col.prop(st, "use_proxies")
- if st.proxy_render_size in ('NONE', 'SCENE'):
+ if st.proxy_render_size in {'NONE', 'SCENE'}:
col.enabled = False
col = layout.column()
diff --git a/release/scripts/startup/bl_ui/space_spreadsheet.py b/release/scripts/startup/bl_ui/space_spreadsheet.py
index db9133456a7..188eddbcce3 100644
--- a/release/scripts/startup/bl_ui/space_spreadsheet.py
+++ b/release/scripts/startup/bl_ui/space_spreadsheet.py
@@ -32,13 +32,13 @@ class SPREADSHEET_HT_header(bpy.types.Header):
used_id = pinned_id if pinned_id else context.active_object
layout.prop(space, "object_eval_state", text="")
- if space.object_eval_state != "ORIGINAL":
+ if space.object_eval_state != 'ORIGINAL':
layout.prop(space, "geometry_component_type", text="")
if space.geometry_component_type != 'INSTANCES':
layout.prop(space, "attribute_domain", text="")
if used_id:
- layout.label(text=used_id.name, icon="OBJECT_DATA")
+ layout.label(text=used_id.name, icon='OBJECT_DATA')
layout.operator("spreadsheet.toggle_pin", text="", icon='PINNED' if pinned_id else 'UNPINNED', emboss=False)
diff --git a/source/blender/blenlib/BLI_virtual_array.hh b/source/blender/blenlib/BLI_virtual_array.hh
index 3e5e5378cf4..0f6240bad95 100644
--- a/source/blender/blenlib/BLI_virtual_array.hh
+++ b/source/blender/blenlib/BLI_virtual_array.hh
@@ -221,7 +221,7 @@ template<typename T> class VArrayForSingle final : public VArray<T> {
* exponential number of function instantiations (increasing compile time and binary size).
*
* Generally, this function should only be used when the virtual method call overhead to get an
- * element from a virtual array is signifant.
+ * element from a virtual array is significant.
*/
template<typename T, typename Func>
inline void devirtualize_varray(const VArray<T> &varray, const Func &func, bool enable = true)
diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index a4a16acf1d1..00f4c49fda9 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -103,7 +103,7 @@ static eSpaceSeq_Proxy_RenderSize get_sequencer_render_size(Main *bmain)
return render_size;
}
-static bool can_use_proxy(Sequence *seq, int psize)
+static bool can_use_proxy(const Sequence *seq, int psize)
{
if (seq->strip->proxy == NULL) {
return false;