forked from bartvdbraak/blender
use 'is None' rather then '== None' as suggested by python docs & mis-spelling.
This commit is contained in:
parent
e72c278f47
commit
6e5ce953da
@ -645,7 +645,7 @@ void MergeVertsFast(int piTriList_in_and_out[], STmpVert pTmpVert[], const SMikk
|
|||||||
int iL=iL_in, iR=iR_in;
|
int iL=iL_in, iR=iR_in;
|
||||||
assert((iR_in-iL_in)>0); // at least 2 entries
|
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)
|
while(iL < iR)
|
||||||
{
|
{
|
||||||
tbool bReadyLeftSwap = TFALSE, bReadyRightSwap = TFALSE;
|
tbool bReadyLeftSwap = TFALSE, bReadyRightSwap = TFALSE;
|
||||||
|
@ -195,7 +195,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
|
|||||||
for mod in modules_from_path(path, loaded_modules):
|
for mod in modules_from_path(path, loaded_modules):
|
||||||
test_register(mod)
|
test_register(mod)
|
||||||
|
|
||||||
# deal with addons seperately
|
# deal with addons separately
|
||||||
_addon_utils.reset_all(reload_scripts)
|
_addon_utils.reset_all(reload_scripts)
|
||||||
|
|
||||||
# run the active integration preset
|
# run the active integration preset
|
||||||
|
@ -29,7 +29,7 @@ from bl_ui.properties_physics_common import (
|
|||||||
|
|
||||||
|
|
||||||
def particle_panel_enabled(context, psys):
|
def particle_panel_enabled(context, psys):
|
||||||
if psys == None:
|
if psys is None:
|
||||||
return True
|
return True
|
||||||
phystype = psys.settings.physics_type
|
phystype = psys.settings.physics_type
|
||||||
if psys.settings.type in {'EMITTER', 'REACTOR'} and phystype in {'NO', 'KEYED'}:
|
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_add", icon='ZOOMIN', text="")
|
||||||
col.operator("object.particle_system_remove", icon='ZOOMOUT', text="")
|
col.operator("object.particle_system_remove", icon='ZOOMOUT', text="")
|
||||||
|
|
||||||
if psys == None:
|
if psys is None:
|
||||||
part = particle_get_settings(context)
|
part = particle_get_settings(context)
|
||||||
|
|
||||||
if part == None:
|
if part is None:
|
||||||
return
|
return
|
||||||
|
|
||||||
layout.template_ID(context.space_data, "pin_id")
|
layout.template_ID(context.space_data, "pin_id")
|
||||||
@ -192,7 +192,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel):
|
|||||||
if settings.is_fluid:
|
if settings.is_fluid:
|
||||||
return False
|
return False
|
||||||
if particle_panel_poll(PARTICLE_PT_emission, context):
|
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
|
return False
|
||||||
|
|
||||||
def draw(self, context):
|
def draw(self, context):
|
||||||
@ -201,7 +201,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel):
|
|||||||
psys = context.particle_system
|
psys = context.particle_system
|
||||||
part = particle_get_settings(context)
|
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 = layout.row()
|
||||||
row.active = part.distribution != 'GRID'
|
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:
|
if settings.type == 'HAIR' and not settings.use_advanced_hair:
|
||||||
return False
|
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:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@ -391,7 +391,7 @@ class PARTICLE_PT_rotation(ParticleButtonsPanel, bpy.types.Panel):
|
|||||||
|
|
||||||
if settings.type == 'HAIR' and not settings.use_advanced_hair:
|
if settings.type == 'HAIR' and not settings.use_advanced_hair:
|
||||||
return False
|
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:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@ -440,7 +440,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel):
|
|||||||
|
|
||||||
if settings.type == 'HAIR' and not settings.use_advanced_hair:
|
if settings.type == 'HAIR' and not settings.use_advanced_hair:
|
||||||
return False
|
return False
|
||||||
return psys == None or not psys.point_cache.use_external
|
return psys is None or not psys.point_cache.use_external
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@ -1143,7 +1143,7 @@ class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, bpy.types.Panel):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def poll(cls, context):
|
def poll(cls, context):
|
||||||
if context.particle_system == None:
|
if context.particle_system is None:
|
||||||
return False
|
return False
|
||||||
return particle_panel_poll(cls, context)
|
return particle_panel_poll(cls, context)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user