[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34445] trunk/blender/source/blender: comment dead code and fix 2 missing NULL checks ( pointer used after NULL check and checking against incorrect pointer before use ).
Campbell Barton
ideasman42 at gmail.com
Sat Jan 22 04:50:10 CET 2011
Revision: 34445
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34445
Author: campbellbarton
Date: 2011-01-22 03:50:09 +0000 (Sat, 22 Jan 2011)
Log Message:
-----------
comment dead code and fix 2 missing NULL checks (pointer used after NULL check and checking against incorrect pointer before use).
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/imbuf/intern/jp2.c
trunk/blender/source/blender/render/intern/source/rayobject_octree.c
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2011-01-21 11:52:56 UTC (rev 34444)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2011-01-22 03:50:09 UTC (rev 34445)
@@ -1317,8 +1317,9 @@
VECSUB(extent, X[s->ij], tvect);
- dot = INPR(extent, extent);
- length = sqrt(dot);
+ // SEE MSG BELOW (these are UNUSED)
+ // dot = INPR(extent, extent);
+ // length = sqrt(dot);
k = clmd->sim_parms->goalspring;
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2011-01-21 11:52:56 UTC (rev 34444)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2011-01-22 03:50:09 UTC (rev 34445)
@@ -2743,7 +2743,7 @@
{
ParticleThread *pthreads;
ParticleThreadContext *ctx;
- ParticleCacheKey **cache;
+ /*ParticleCacheKey **cache;*/ /*UNUSED*/
ListBase threads;
int i, totchild, totparent, totthread;
@@ -2762,7 +2762,7 @@
totparent= ctx->totparent;
if(editupdate && sim->psys->childcache && totchild == sim->psys->totchildcache) {
- cache = sim->psys->childcache;
+ /*cache = sim->psys->childcache;*/ /*UNUSED*/
}
else {
/* clear out old and create new empty path cache */
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2011-01-21 11:52:56 UTC (rev 34444)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2011-01-22 03:50:09 UTC (rev 34445)
@@ -3403,7 +3403,7 @@
PARTICLE_P;
float timestep;
/* current time */
- float ctime;
+ /* float ctime; */ /*UNUSED*/
/* frame & time changes */
float dfra, dtime;
float birthtime, dietime;
@@ -3412,7 +3412,7 @@
dfra= cfra - psys->cfra;
timestep = psys_get_timestep(sim);
- ctime= cfra*timestep;
+ /*ctime= cfra*timestep;*/ /*UNUSED*/
dtime= dfra*timestep;
if(dfra<0.0){
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-01-21 11:52:56 UTC (rev 34444)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-01-22 03:50:09 UTC (rev 34445)
@@ -3823,11 +3823,11 @@
clmd->sim_parms->reset = 0;
clmd->sim_parms->effector_weights = newdataadr(fd, clmd->sim_parms->effector_weights);
+
+ if(!clmd->sim_parms->effector_weights) {
+ clmd->sim_parms->effector_weights = BKE_add_effector_weights(NULL);
+ }
}
-
- if(!clmd->sim_parms->effector_weights)
- clmd->sim_parms->effector_weights = BKE_add_effector_weights(NULL);
-
}
else if (md->type==eModifierType_Fluidsim) {
FluidsimModifierData *fluidmd = (FluidsimModifierData*) md;
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c 2011-01-21 11:52:56 UTC (rev 34444)
+++ trunk/blender/source/blender/editors/armature/editarmature.c 2011-01-22 03:50:09 UTC (rev 34445)
@@ -3000,14 +3000,13 @@
bArmature *arm= (obedit) ? obedit->data : NULL;
Scene *scene= CTX_data_scene(C);
View3D *v3d= CTX_wm_view3d(C);
- EditBone *newbone=NULL;
ListBase points = {NULL, NULL};
int count;
-
+
/* sanity checks */
- if ELEM(NULL, obedit, arm)
+ if (ELEM(NULL, obedit, arm))
return OPERATOR_CANCELLED;
-
+
/* loop over all bones, and only consider if visible */
CTX_DATA_BEGIN(C, EditBone *, ebone, visible_bones)
{
@@ -3041,7 +3040,7 @@
mul_v3_m4v3(curs, obedit->imat, give_cursor(scene, v3d));
/* Create a bone */
- newbone= add_points_bone(obedit, ebp->vec, curs);
+ /* newbone= */ add_points_bone(obedit, ebp->vec, curs);
}
else if (count == 2) {
EditBonePoint *ebp, *ebp2;
@@ -3102,7 +3101,7 @@
/* add new bone and parent it to the appropriate end */
if (headtail) {
- newbone= add_points_bone(obedit, head, tail);
+ EditBone *newbone= add_points_bone(obedit, head, tail);
/* do parenting (will need to set connected flag too) */
if (headtail == 2) {
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2011-01-21 11:52:56 UTC (rev 34444)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2011-01-22 03:50:09 UTC (rev 34445)
@@ -6096,21 +6096,18 @@
Curve *cu= (Curve*)obedit->data;
float vec[3], zvec[3]= {0.0f, 0.0f, 1.0f};
float umat[4][4]= MAT4_UNITY, viewmat[4][4]= MAT4_UNITY;
- float fac, grid;
- int a, b, cutype, stype;
- int force_3d = ((Curve *)obedit->data)->flag & CU_3D; /* could be adding to an existing 3D curve */
+ float fac;
+ int a, b;
+ const float grid= v3d ? v3d->grid : 1.0f;
+ const int cutype= (type & CU_TYPE); // poly, bezier, nurbs, etc
+ const int stype= (type & CU_PRIMITIVE);
+ const int force_3d = ((Curve *)obedit->data)->flag & CU_3D; /* could be adding to an existing 3D curve */
if(rv3d) {
copy_m4_m4(viewmat, rv3d->viewmat);
VECCOPY(zvec, rv3d->viewinv[2]);
}
-
- cutype= type & CU_TYPE; // poly, bezier, nurbs, etc
- stype= type & CU_PRIMITIVE;
-
- if (v3d) grid = v3d->grid;
- else grid = 1.0;
-
+
setflagsNurb(editnurb, 0);
/* these types call this function to return a Nurb */
@@ -6432,6 +6429,10 @@
}
break;
+
+ default: /* should never happen */
+ BLI_assert(!"invalid nurbs type");
+ return NULL;
}
/* always do: */
Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c 2011-01-21 11:52:56 UTC (rev 34444)
+++ trunk/blender/source/blender/editors/object/object_add.c 2011-01-22 03:50:09 UTC (rev 34445)
@@ -491,7 +491,7 @@
static int object_metaball_add_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
- MetaElem *elem;
+ /*MetaElem *elem;*/ /*UNUSED*/
int newob= 0;
int enter_editmode;
unsigned int layer;
@@ -511,7 +511,7 @@
ED_object_new_primitive_matrix(C, obedit, loc, rot, mat);
- elem= (MetaElem*)add_metaball_primitive(C, mat, RNA_enum_get(op->ptr, "type"), newob);
+ /* elem= (MetaElem *) */ add_metaball_primitive(C, mat, RNA_enum_get(op->ptr, "type"), newob);
/* userdef */
if (newob && !enter_editmode) {
Modified: trunk/blender/source/blender/editors/object/object_constraint.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_constraint.c 2011-01-21 11:52:56 UTC (rev 34444)
+++ trunk/blender/source/blender/editors/object/object_constraint.c 2011-01-22 03:50:09 UTC (rev 34445)
@@ -469,11 +469,11 @@
static int edit_constraint_poll_generic(bContext *C, StructRNA *rna_type)
{
PointerRNA ptr= CTX_data_pointer_get_type(C, "constraint", rna_type);
- Object *ob= (ptr.id.data)?ptr.id.data:ED_object_active_context(C);
-
+ Object *ob= (ptr.id.data) ? ptr.id.data : ED_object_active_context(C);
+
if (!ob || ob->id.lib) return 0;
- if (ptr.data && ((ID*)ptr.id.data)->lib) return 0;
-
+ if (ptr.id.data && ((ID*)ptr.id.data)->lib) return 0;
+
return 1;
}
Modified: trunk/blender/source/blender/imbuf/intern/jp2.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jp2.c 2011-01-21 11:52:56 UTC (rev 34444)
+++ trunk/blender/source/blender/imbuf/intern/jp2.c 2011-01-22 03:50:09 UTC (rev 34445)
@@ -95,9 +95,9 @@
struct ImBuf *ibuf = 0;
int use_float = 0; /* for precision higher then 8 use float */
- long signed_offsets[4] = {0,0,0,0};
- int float_divs[4];
-
+ long signed_offsets[4]= {0, 0, 0, 0};
+ int float_divs[4]= {1, 1, 1, 1};
+
int index;
int w, h, depth;
Modified: trunk/blender/source/blender/render/intern/source/rayobject_octree.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayobject_octree.c 2011-01-21 11:52:56 UTC (rev 34444)
+++ trunk/blender/source/blender/render/intern/source/rayobject_octree.c 2011-01-22 03:50:09 UTC (rev 34445)
@@ -976,7 +976,7 @@
}
xo=ocx1; yo=ocy1; zo=ocz1;
- labdao= ddalabda= MIN3(labdax,labday,labdaz);
+ /*labdao= ddalabda= MIN3(labdax,labday,labdaz);*/ /*NEVER READ*/
vec2[0]= ox1;
vec2[1]= oy1;
More information about the Bf-blender-cvs
mailing list