[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33753] trunk/blender: remove some paranoid NULL checks, since the pointers are used already.
Campbell Barton
ideasman42 at gmail.com
Fri Dec 17 20:05:10 CET 2010
Revision: 33753
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33753
Author: campbellbarton
Date: 2010-12-17 20:05:10 +0100 (Fri, 17 Dec 2010)
Log Message:
-----------
remove some paranoid NULL checks, since the pointers are used already.
Modified Paths:
--------------
trunk/blender/release/plugins/sequence/color-correction-hsv.c
trunk/blender/release/plugins/sequence/color-correction-yuv.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/editors/metaball/mball_edit.c
trunk/blender/source/blender/render/intern/source/voxeldata.c
Modified: trunk/blender/release/plugins/sequence/color-correction-hsv.c
===================================================================
--- trunk/blender/release/plugins/sequence/color-correction-hsv.c 2010-12-17 18:38:44 UTC (rev 33752)
+++ trunk/blender/release/plugins/sequence/color-correction-hsv.c 2010-12-17 19:05:10 UTC (rev 33753)
@@ -187,12 +187,13 @@
double gamma_table[256];
double uv_table[256];
float *destf = out->rect_float;
- float *src1f = ibuf1->rect_float;
+ float *src1f;
if (!ibuf1) return;
dest= (char *) out->rect;
src1= (char *) ibuf1->rect;
+ src1f= ibuf1->rect_float;
for (y = 0; y < 256; y++) {
float v = 1.0 * y / 255;
Modified: trunk/blender/release/plugins/sequence/color-correction-yuv.c
===================================================================
--- trunk/blender/release/plugins/sequence/color-correction-yuv.c 2010-12-17 18:38:44 UTC (rev 33752)
+++ trunk/blender/release/plugins/sequence/color-correction-yuv.c 2010-12-17 19:05:10 UTC (rev 33753)
@@ -120,12 +120,13 @@
float gamma_table[256];
float uv_table[256];
float *destf = out->rect_float;
- float *src1f = ibuf1->rect_float;
+ float *src1f;
if (!ibuf1) return;
dest= (char *) out->rect;
src1= (char *) ibuf1->rect;
+ src1f= ibuf1->rect_float;
for (y = 0; y < 256; y++) {
float v = 1.0 * y / 255;
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2010-12-17 18:38:44 UTC (rev 33752)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2010-12-17 19:05:10 UTC (rev 33753)
@@ -199,7 +199,6 @@
static struct PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm)
{
CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
- Mesh *me= (ob)? ob->data: NULL;
if(!ob) {
cddm->pbvh= NULL;
@@ -217,6 +216,7 @@
this derivedmesh is just original mesh. it's the multires subsurf dm
that this is actually for, to support a pbvh on a modified mesh */
if(!cddm->pbvh && ob->type == OB_MESH) {
+ Mesh *me= ob->data;
cddm->pbvh = BLI_pbvh_new();
cddm->pbvh_draw = can_pbvh_draw(ob, dm);
BLI_pbvh_build_mesh(cddm->pbvh, me->mface, me->mvert,
Modified: trunk/blender/source/blender/editors/metaball/mball_edit.c
===================================================================
--- trunk/blender/source/blender/editors/metaball/mball_edit.c 2010-12-17 18:38:44 UTC (rev 33752)
+++ trunk/blender/source/blender/editors/metaball/mball_edit.c 2010-12-17 19:05:10 UTC (rev 33753)
@@ -95,8 +95,6 @@
MetaBall *mball = (MetaBall*)obedit->data;
MetaElem *ml;
- if(!obedit) return NULL;
-
/* Deselect all existing metaelems */
ml= mball->editelems->first;
while(ml) {
Modified: trunk/blender/source/blender/render/intern/source/voxeldata.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/voxeldata.c 2010-12-17 18:38:44 UTC (rev 33752)
+++ trunk/blender/source/blender/render/intern/source/voxeldata.c 2010-12-17 19:05:10 UTC (rev 33753)
@@ -272,8 +272,6 @@
int curframe;
char path[sizeof(vd->source_path)];
- if (!vd) return;
-
/* only re-cache if dataset needs updating */
if ((vd->flag & TEX_VD_STILL) || (vd->cachedframe == re->r.cfra))
if (vd->ok) return;
More information about the Bf-blender-cvs
mailing list