[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54133] trunk/blender/source/blender: style cleanup: also remove unneeded NULL check.
Campbell Barton
ideasman42 at gmail.com
Mon Jan 28 03:00:01 CET 2013
Revision: 54133
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54133
Author: campbellbarton
Date: 2013-01-28 01:59:59 +0000 (Mon, 28 Jan 2013)
Log Message:
-----------
style cleanup: also remove unneeded NULL check.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/bmesh/intern/bmesh_log.c
trunk/blender/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/object/object_ops.c
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2013-01-28 01:41:15 UTC (rev 54132)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2013-01-28 01:59:59 UTC (rev 54133)
@@ -1712,7 +1712,7 @@
if (ccgdm->pbvh && ccgdm->multires.mmd && !fast) {
if (dm->numTessFaceData) {
BKE_pbvh_draw(ccgdm->pbvh, partial_redraw_planes, NULL,
- setMaterial, FALSE);
+ setMaterial, FALSE);
glShadeModel(GL_FLAT);
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_log.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_log.c 2013-01-28 01:41:15 UTC (rev 54132)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_log.c 2013-01-28 01:59:59 UTC (rev 54133)
@@ -452,7 +452,8 @@
/* Let BMLog manage the entry list again */
log->entries.first = log->entries.last = entry;
- if (entry) {
+
+ {
while (entry->prev) {
entry = entry->prev;
log->entries.first = entry;
Modified: trunk/blender/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_DilateErodeOperation.cpp 2013-01-28 01:41:15 UTC (rev 54132)
+++ trunk/blender/source/blender/compositor/operations/COM_DilateErodeOperation.cpp 2013-01-28 01:59:59 UTC (rev 54133)
@@ -345,8 +345,8 @@
*/
int half_window = this->m_iterations;
int window = half_window * 2 + 1;
- float *temp = (float *)MEM_mallocN((2*window - 1) * sizeof(float), "dilate erode temp");
- float *buf = (float *)MEM_mallocN((max(bwidth, bheight) + 5*half_window) * sizeof(float), "dilate erode buf");
+ float *temp = (float *)MEM_mallocN((2 * window - 1) * sizeof(float), "dilate erode temp");
+ float *buf = (float *)MEM_mallocN((max(bwidth, bheight) + 5 * half_window) * sizeof(float), "dilate erode buf");
for (y = 0; y < bheight; y++) {
for (x = 0; x < window - 1; x++) {
@@ -355,11 +355,11 @@
for (x = 0; x < bwidth; x++) {
buf[x + window - 1] = rectf[bwidth * y + x];
}
- for (x = bwidth + window - 1; x < bwidth + 5*half_window; x++) {
+ for (x = bwidth + window - 1; x < bwidth + 5 * half_window; x++) {
buf[x] = -MAXFLOAT;
}
- for(i = 0; i < (bwidth + 3*half_window) / window; i++) {
+ for (i = 0; i < (bwidth + 3 * half_window) / window; i++) {
int start = (i + 1) * window - 1;
temp[window - 1] = buf[start];
@@ -368,8 +368,8 @@
temp[window - 1 + x] = max(temp[window + x - 2], buf[start + x]);
}
- start = half_window + (i-1) * window + 1;
- for (x = -min(0, start); x < window - max(0, start+window - bwidth); x++) {
+ start = half_window + (i - 1) * window + 1;
+ for (x = -min(0, start); x < window - max(0, start + window - bwidth); x++) {
rectf[bwidth * y + (start + x)] = max(temp[x], temp[x + window - 1]);
}
}
@@ -382,11 +382,11 @@
for (y = 0; y < bheight; y++) {
buf[y + window - 1] = rectf[bwidth * y + x];
}
- for (y = bheight + window - 1; y < bheight + 5*half_window; y++) {
+ for (y = bheight + window - 1; y < bheight + 5 * half_window; y++) {
buf[y] = -MAXFLOAT;
}
- for(i = 0; i < (bheight + 3*half_window) / window; i++) {
+ for (i = 0; i < (bheight + 3 * half_window) / window; i++) {
int start = (i + 1) * window - 1;
temp[window - 1] = buf[start];
@@ -395,8 +395,8 @@
temp[window - 1 + y] = max(temp[window + y - 2], buf[start + y]);
}
- start = half_window + (i-1) * window + 1;
- for (y = -min(0, start); y < window - max(0, start+window - bheight); y++) {
+ start = half_window + (i - 1) * window + 1;
+ for (y = -min(0, start); y < window - max(0, start + window - bheight); y++) {
rectf[bwidth * (y + start) + x] = max(temp[y], temp[y + window - 1]);
}
}
@@ -464,8 +464,8 @@
int half_window = this->m_iterations;
int window = half_window * 2 + 1;
- float *temp = (float *)MEM_mallocN((2*window - 1) * sizeof(float), "dilate erode temp");
- float *buf = (float *)MEM_mallocN((max(bwidth, bheight) + 5*half_window) * sizeof(float), "dilate erode buf");
+ float *temp = (float *)MEM_mallocN((2 * window - 1) * sizeof(float), "dilate erode temp");
+ float *buf = (float *)MEM_mallocN((max(bwidth, bheight) + 5 * half_window) * sizeof(float), "dilate erode buf");
for (y = 0; y < bheight; y++) {
for (x = 0; x < window - 1; x++) {
@@ -474,11 +474,11 @@
for (x = 0; x < bwidth; x++) {
buf[x + window - 1] = rectf[bwidth * y + x];
}
- for (x = bwidth + window - 1; x < bwidth + 5*half_window; x++) {
+ for (x = bwidth + window - 1; x < bwidth + 5 * half_window; x++) {
buf[x] = MAXFLOAT;
}
- for(i = 0; i < (bwidth + 3*half_window) / window; i++) {
+ for (i = 0; i < (bwidth + 3 * half_window) / window; i++) {
int start = (i + 1) * window - 1;
temp[window - 1] = buf[start];
@@ -487,8 +487,8 @@
temp[window - 1 + x] = min(temp[window + x - 2], buf[start + x]);
}
- start = half_window + (i-1) * window + 1;
- for (x = -min(0, start); x < window - max(0, start+window - bwidth); x++) {
+ start = half_window + (i - 1) * window + 1;
+ for (x = -min(0, start); x < window - max(0, start + window - bwidth); x++) {
rectf[bwidth * y + (start + x)] = min(temp[x], temp[x + window - 1]);
}
}
@@ -501,11 +501,11 @@
for (y = 0; y < bheight; y++) {
buf[y + window - 1] = rectf[bwidth * y + x];
}
- for (y = bheight + window - 1; y < bheight + 5*half_window; y++) {
+ for (y = bheight + window - 1; y < bheight + 5 * half_window; y++) {
buf[y] = MAXFLOAT;
}
- for(i = 0; i < (bheight + 3*half_window) / window; i++) {
+ for (i = 0; i < (bheight + 3 * half_window) / window; i++) {
int start = (i + 1) * window - 1;
temp[window - 1] = buf[start];
@@ -514,8 +514,8 @@
temp[window - 1 + y] = min(temp[window + y - 2], buf[start + y]);
}
- start = half_window + (i-1) * window + 1;
- for (y = -min(0, start); y < window - max(0, start+window - bheight); y++) {
+ start = half_window + (i - 1) * window + 1;
+ for (y = -min(0, start); y < window - max(0, start + window - bheight); y++) {
rectf[bwidth * (y + start) + x] = min(temp[y], temp[y + window - 1]);
}
}
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c 2013-01-28 01:41:15 UTC (rev 54132)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c 2013-01-28 01:59:59 UTC (rev 54133)
@@ -544,7 +544,7 @@
but = uiDefIconButO(block, BUT, "FILE_OT_unpack_item", WM_OP_INVOKE_REGION_WIN, ICON_PACKAGE, 0, 0, UI_UNIT_X, UI_UNIT_Y, "Packed File");
uiButGetOperatorPtrRNA(but);
- RNA_string_set(but->opptr, "id_name", id->name+2);
+ RNA_string_set(but->opptr, "id_name", id->name + 2);
RNA_int_set(but->opptr, "id_type", GS(id->name));
}
Modified: trunk/blender/source/blender/editors/object/object_ops.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_ops.c 2013-01-28 01:41:15 UTC (rev 54132)
+++ trunk/blender/source/blender/editors/object/object_ops.c 2013-01-28 01:59:59 UTC (rev 54133)
@@ -399,7 +399,7 @@
RNA_enum_set(kmi->ptr, "type", 0); /* active */
kmi = WM_keymap_add_item(keymap, "RIGIDBODY_OT_objects_add", RKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
RNA_enum_set(kmi->ptr, "type", 1); /* passive */
- kmi = WM_keymap_add_item(keymap, "RIGIDBODY_OT_objects_remove", RKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
+ WM_keymap_add_item(keymap, "RIGIDBODY_OT_objects_remove", RKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
WM_keymap_add_menu(keymap, "VIEW3D_MT_object_specials", WKEY, KM_PRESS, 0, 0);
More information about the Bf-blender-cvs
mailing list