archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

hide addon_utils in bpy.utils & tag/remove unused vars in recent commits.

Browse Source
This commit is contained in:
Campbell Barton
2011-03-18 20:57:32 +00:00
parent b66f7a471c
commit e44da6b695
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/modules/bpy/utils.py
View File

@@ -31,7 +31,7 @@ import bpy as _bpy
import os as _os
import sys as _sys
import addon_utils
import addon_utils as _addon_utils
def _test_import(module_name, loaded_modules):
@@ -118,7 +118,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
# note that they will only actually reload of the modification time changes.
# this `wont` work for packages so... its not perfect.
for module_name in [ext.module for ext in _bpy.context.user_preferences.addons]:
addon_utils.disable(module_name, default_set=False)
_addon_utils.disable(module_name, default_set=False)
def register_module_call(mod):
register = getattr(mod, "register", None)
@@ -201,7 +201,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
test_register(mod)
# deal with addons seperately
addon_utils.reset_all(reload_scripts)
_addon_utils.reset_all(reload_scripts)
# run the active integration preset
filepath = preset_find(_bpy.context.user_preferences.inputs.active_keyconfig, "keyconfig")

6
source/blender/blenkernel/intern/particle_system.c
View File

@@ -2639,7 +2639,7 @@ static float nr_signed_distance_to_plane(float *p, float radius, ParticleCollisi
return d - radius;
}
static float nr_distance_to_edge(float *p, float radius, ParticleCollisionElement *pce, float *nor)
static float nr_distance_to_edge(float *p, float radius, ParticleCollisionElement *pce, float *UNUSED(nor))
{
float v0[3], v1[3], v2[3], c[3];
@@ -2651,7 +2651,7 @@ static float nr_distance_to_edge(float *p, float radius, ParticleCollisionElemen
return fabs(len_v3(c)/len_v3(v0)) - radius;
}
static float nr_distance_to_vert(float *p, float radius, ParticleCollisionElement *pce, float *nor)
static float nr_distance_to_vert(float *p, float radius, ParticleCollisionElement *pce, float *UNUSED(nor))
{
return len_v3v3(p, pce->x0) - radius;
}
@@ -2966,7 +2966,6 @@ void BKE_psys_collision_neartest_cb(void *userdata, int index, const BVHTreeRay
MVert *x = col->md->x;
MVert *v = col->md->current_v;
float t = hit->dist/col->original_ray_length;
float uv[2] = {0.f,0.f};
int collision = 0, quad = 0;
pce.x[0] = x[face->v1].co;
@@ -3245,7 +3244,6 @@ static void collision_fail(ParticleData *pa, ParticleCollision *col)
* -handles spherical particles and (nearly) point like particles
*/
static void collision_check(ParticleSimulationData *sim, int p, float dfra, float cfra){
Object *ground_ob = NULL;
ParticleSettings *part = sim->psys->part;
ParticleData *pa = sim->psys->particles + p;
ParticleCollision col;