[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53926] trunk/blender: code cleanup: remove some paranoid checks which would have crashed anyway earlier on.
Campbell Barton
ideasman42 at gmail.com
Sun Jan 20 15:50:52 CET 2013
Revision: 53926
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53926
Author: campbellbarton
Date: 2013-01-20 14:50:50 +0000 (Sun, 20 Jan 2013)
Log Message:
-----------
code cleanup: remove some paranoid checks which would have crashed anyway earlier on.
Also some minor formatting.
Modified Paths:
--------------
trunk/blender/intern/cycles/kernel/kernel_primitive.h
trunk/blender/intern/cycles/render/camera.h
trunk/blender/intern/cycles/render/nodes.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp
trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
Modified: trunk/blender/intern/cycles/kernel/kernel_primitive.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_primitive.h 2013-01-20 14:40:31 UTC (rev 53925)
+++ trunk/blender/intern/cycles/kernel/kernel_primitive.h 2013-01-20 14:50:50 UTC (rev 53926)
@@ -106,7 +106,7 @@
float3 data = primitive_attribute_float3(kg, sd, attr_elem, attr_offset, NULL, NULL);
data = make_float3(-(data.y - 0.5f), (data.x - 0.5f), 0.0f);
object_normal_transform(kg, sd, &data);
- return cross(sd->N, normalize(cross(data, sd->N)));;
+ return cross(sd->N, normalize(cross(data, sd->N)));
}
else {
/* otherwise use surface derivatives */
Modified: trunk/blender/intern/cycles/render/camera.h
===================================================================
--- trunk/blender/intern/cycles/render/camera.h 2013-01-20 14:40:31 UTC (rev 53925)
+++ trunk/blender/intern/cycles/render/camera.h 2013-01-20 14:50:50 UTC (rev 53926)
@@ -90,7 +90,7 @@
Transform worldtocamera;
Transform rastertocamera;
- Transform cameratoraster;;
+ Transform cameratoraster;
float3 dx;
float3 dy;
Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp 2013-01-20 14:40:31 UTC (rev 53925)
+++ trunk/blender/intern/cycles/render/nodes.cpp 2013-01-20 14:50:50 UTC (rev 53926)
@@ -144,7 +144,7 @@
filename = "";
is_builtin = false;
color_space = ustring("Color");
- projection = ustring("Flat");;
+ projection = ustring("Flat");
projection_blend = 0.0f;
animated = false;
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp 2013-01-20 14:40:31 UTC (rev 53925)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp 2013-01-20 14:50:50 UTC (rev 53926)
@@ -182,7 +182,8 @@
(SInt32) this); // Store a pointer to the class in the refCon
#endif
//GHOST_PRINT("GHOST_WindowCarbon::GHOST_WindowCarbon(): creating full-screen OpenGL context\n");
- setDrawingContextType(GHOST_kDrawingContextTypeOpenGL);; installDrawingContext(GHOST_kDrawingContextTypeOpenGL);
+ setDrawingContextType(GHOST_kDrawingContextTypeOpenGL);
+ installDrawingContext(GHOST_kDrawingContextTypeOpenGL);
updateDrawingContext();
activateDrawingContext();
Modified: trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2013-01-20 14:40:31 UTC (rev 53925)
+++ trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2013-01-20 14:50:50 UTC (rev 53926)
@@ -1416,18 +1416,25 @@
float no[3];
for (S = 0; S < f->numVerts; S++) {
- for (y = 0; y < gridSize - 1; y++)
- for (x = 0; x < gridSize - 1; x++)
+ for (y = 0; y < gridSize - 1; y++) {
+ for (x = 0; x < gridSize - 1; x++) {
NormZero(FACE_getIFNo(f, lvl, S, x, y));
+ }
+ }
- if (FACE_getEdges(f)[(S - 1 + f->numVerts) % f->numVerts]->flags & Edge_eEffected)
- for (x = 0; x < gridSize - 1; x++)
+ if (FACE_getEdges(f)[(S - 1 + f->numVerts) % f->numVerts]->flags & Edge_eEffected) {
+ for (x = 0; x < gridSize - 1; x++) {
NormZero(FACE_getIFNo(f, lvl, S, x, gridSize - 1));
- if (FACE_getEdges(f)[S]->flags & Edge_eEffected)
- for (y = 0; y < gridSize - 1; y++)
+ }
+ }
+ if (FACE_getEdges(f)[S]->flags & Edge_eEffected) {
+ for (y = 0; y < gridSize - 1; y++) {
NormZero(FACE_getIFNo(f, lvl, S, gridSize - 1, y));
- if (FACE_getVerts(f)[S]->flags & Vert_eEffected)
+ }
+ }
+ if (FACE_getVerts(f)[S]->flags & Vert_eEffected) {
NormZero(FACE_getIFNo(f, lvl, S, gridSize - 1, gridSize - 1));
+ }
}
for (S = 0; S < f->numVerts; S++) {
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-01-20 14:40:31 UTC (rev 53925)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-01-20 14:50:50 UTC (rev 53926)
@@ -308,8 +308,9 @@
pa->lifetime = times[2];
}
- if (boid)
+ if (boid) {
PTCACHE_DATA_TO(data, BPHYS_DATA_BOIDS, 0, &boid->data);
+ }
/* determine velocity from previous location */
if (data[BPHYS_DATA_LOCATION] && !data[BPHYS_DATA_VELOCITY]) {
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c 2013-01-20 14:40:31 UTC (rev 53925)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c 2013-01-20 14:50:50 UTC (rev 53926)
@@ -517,7 +517,7 @@
const int type = bm->ldata.layers[i].type;
void *cd_src[2] = {(char *)src[0] + offset,
(char *)src[1] + offset};
- void *cd_iter = (char *)l_iter->head.data + offset;;
+ void *cd_iter = (char *)l_iter->head.data + offset;
/* detect seams */
if (CustomData_data_equals(type, cd_src[0], cd_iter)) {
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2013-01-20 14:40:31 UTC (rev 53925)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2013-01-20 14:50:50 UTC (rev 53926)
@@ -2598,9 +2598,8 @@
BKE_paint_init(&vp->paint, PAINT_CURSOR_VERTEX_PAINT);
}
- if (me)
- /* update modifier stack for mapping requirements */
- DAG_id_tag_update(&me->id, 0);
+ /* update modifier stack for mapping requirements */
+ DAG_id_tag_update(&me->id, 0);
WM_event_add_notifier(C, NC_SCENE | ND_MODE, scene);
Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c 2013-01-20 14:40:31 UTC (rev 53925)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c 2013-01-20 14:50:50 UTC (rev 53926)
@@ -1505,7 +1505,7 @@
static void rna_property_update(bContext *C, Main *bmain, Scene *scene, PointerRNA *ptr, PropertyRNA *prop)
{
- int is_rna = (prop->magic == RNA_MAGIC);
+ const bool is_rna = (prop->magic == RNA_MAGIC);
prop = rna_ensure_property(prop);
if (is_rna) {
@@ -1585,19 +1585,19 @@
void RNA_property_update_cache_add(PointerRNA *ptr, PropertyRNA *prop)
{
+ const bool is_rna = (prop->magic == RNA_MAGIC);
tRnaUpdateCacheElem *uce = NULL;
UpdateFunc fn = NULL;
LinkData *ld;
- short is_rna = (prop->magic == RNA_MAGIC);
/* sanity check */
- if (ELEM(NULL, ptr, prop))
+ if (NULL == ptr)
return;
prop = rna_ensure_property(prop);
/* we can only handle update calls with no context args for now (makes animsys updates easier) */
- if ((is_rna == 0) || (prop->update == NULL) || (prop->flag & PROP_CONTEXT_UPDATE))
+ if ((is_rna == false) || (prop->update == NULL) || (prop->flag & PROP_CONTEXT_UPDATE))
return;
fn = prop->update;
@@ -4210,11 +4210,11 @@
char *RNA_path_from_ID_to_property(PointerRNA *ptr, PropertyRNA *prop)
{
- int is_rna = (prop->magic == RNA_MAGIC);
+ const bool is_rna = (prop->magic == RNA_MAGIC);
const char *propname;
char *ptrpath, *path;
- if (!ptr->id.data || !ptr->data || !prop)
+ if (!ptr->id.data || !ptr->data)
return NULL;
/* path from ID to the struct holding this property */
More information about the Bf-blender-cvs
mailing list