[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35617] trunk/blender: hide addon_utils in bpy.utils & tag/remove unused vars in recent commits.

[Campbell Barton]

Revision: 35617
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35617
Author:   campbellbarton
Date:     2011-03-18 20:57:32 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
hide addon_utils in bpy.utils & tag/remove unused vars in recent commits.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy/utils.py
    trunk/blender/source/blender/blenkernel/intern/particle_system.c

Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py	2011-03-18 16:35:42 UTC (rev 35616)
+++ trunk/blender/release/scripts/modules/bpy/utils.py	2011-03-18 20:57:32 UTC (rev 35617)
@@ -31,7 +31,7 @@
 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 @@
         # 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 @@
                     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")

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-03-18 16:35:42 UTC (rev 35616)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-03-18 20:57:32 UTC (rev 35617)
@@ -2639,7 +2639,7 @@
 
 	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 @@
 
 	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 @@
 	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 @@
  * -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;