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--intern/mikktspace/mikktspace.c2
-rw-r--r--release/scripts/modules/bpy/utils.py2
-rw-r--r--release/scripts/startup/bl_ui/properties_particle.py18
3 files changed, 11 insertions, 11 deletions
diff --git a/intern/mikktspace/mikktspace.c b/intern/mikktspace/mikktspace.c
index e997bafde25..c05ada84773 100644
--- a/intern/mikktspace/mikktspace.c
+++ b/intern/mikktspace/mikktspace.c
@@ -645,7 +645,7 @@ void MergeVertsFast(int piTriList_in_and_out[], STmpVert pTmpVert[], const SMikk
int iL=iL_in, iR=iR_in;
assert((iR_in-iL_in)>0); // at least 2 entries
- // seperate (by fSep) all points between iL_in and iR_in in pTmpVert[]
+ // separate (by fSep) all points between iL_in and iR_in in pTmpVert[]
while(iL < iR)
{
tbool bReadyLeftSwap = TFALSE, bReadyRightSwap = TFALSE;
diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py
index a8f5925f467..cb2349eab1d 100644
--- a/release/scripts/modules/bpy/utils.py
+++ b/release/scripts/modules/bpy/utils.py
@@ -195,7 +195,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
for mod in modules_from_path(path, loaded_modules):
test_register(mod)
- # deal with addons seperately
+ # deal with addons separately
_addon_utils.reset_all(reload_scripts)
# run the active integration preset
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py
index 9c678bd96b2..be581d0dc31 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -29,7 +29,7 @@ from bl_ui.properties_physics_common import (
def particle_panel_enabled(context, psys):
- if psys == None:
+ if psys is None:
return True
phystype = psys.settings.physics_type
if psys.settings.type in {'EMITTER', 'REACTOR'} and phystype in {'NO', 'KEYED'}:
@@ -98,10 +98,10 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, bpy.types.Panel):
col.operator("object.particle_system_add", icon='ZOOMIN', text="")
col.operator("object.particle_system_remove", icon='ZOOMOUT', text="")
- if psys == None:
+ if psys is None:
part = particle_get_settings(context)
- if part == None:
+ if part is None:
return
layout.template_ID(context.space_data, "pin_id")
@@ -192,7 +192,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel):
if settings.is_fluid:
return False
if particle_panel_poll(PARTICLE_PT_emission, context):
- return psys == None or not context.particle_system.point_cache.use_external
+ return psys is None or not context.particle_system.point_cache.use_external
return False
def draw(self, context):
@@ -201,7 +201,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel):
psys = context.particle_system
part = particle_get_settings(context)
- layout.enabled = particle_panel_enabled(context, psys) and (psys == None or not psys.has_multiple_caches)
+ layout.enabled = particle_panel_enabled(context, psys) and (psys is None or not psys.has_multiple_caches)
row = layout.row()
row.active = part.distribution != 'GRID'
@@ -341,7 +341,7 @@ class PARTICLE_PT_velocity(ParticleButtonsPanel, bpy.types.Panel):
if settings.type == 'HAIR' and not settings.use_advanced_hair:
return False
- return settings.physics_type != 'BOIDS' and (psys == None or not psys.point_cache.use_external)
+ return settings.physics_type != 'BOIDS' and (psys is None or not psys.point_cache.use_external)
else:
return False
@@ -391,7 +391,7 @@ class PARTICLE_PT_rotation(ParticleButtonsPanel, bpy.types.Panel):
if settings.type == 'HAIR' and not settings.use_advanced_hair:
return False
- return settings.physics_type != 'BOIDS' and (psys == None or not psys.point_cache.use_external)
+ return settings.physics_type != 'BOIDS' and (psys is None or not psys.point_cache.use_external)
else:
return False
@@ -440,7 +440,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel):
if settings.type == 'HAIR' and not settings.use_advanced_hair:
return False
- return psys == None or not psys.point_cache.use_external
+ return psys is None or not psys.point_cache.use_external
else:
return False
@@ -1143,7 +1143,7 @@ class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, bpy.types.Panel):
@classmethod
def poll(cls, context):
- if context.particle_system == None:
+ if context.particle_system is None:
return False
return particle_panel_poll(cls, context)