Revision: 58759
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58759
Author: campbellbarton
Date: 2013-07-31 09:18:40 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
code cleanup: remove redundant NULL checks
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/interface/view2d_ops.c
trunk/blender/source/blender/editors/render/render_opengl.c
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c
2013-07-31 09:17:58 UTC (rev 58758)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c
2013-07-31 09:18:40 UTC (rev 58759)
@@ -590,7 +590,7 @@
/* never fails */
id_path = RNA_path_full_ID_py(id);
- if (ptr->id.data && ptr->data && prop) {
+ if (ptr->data && prop) {
data_path = RNA_path_from_ID_to_property(ptr,
prop);
}
@@ -2268,10 +2268,8 @@
block = uiBeginBlock(C, handle->region, __func__, UI_EMBOSS);
- if (but->rnaprop) {
- if (RNA_property_subtype(but->rnaprop) == PROP_COLOR_GAMMA) {
- block->color_profile = FALSE;
- }
+ if (RNA_property_subtype(but->rnaprop) == PROP_COLOR_GAMMA) {
+ block->color_profile = false;
}
if (but->block) {
Modified: trunk/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d_ops.c 2013-07-31
09:17:58 UTC (rev 58758)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c 2013-07-31
09:18:40 UTC (rev 58759)
@@ -1288,7 +1288,7 @@
fac = smooth_view_rect_to_fac(&v2d->cur, cur);
}
- if (C && U.smooth_viewtx && fac > FLT_EPSILON) {
+ if (U.smooth_viewtx && fac > FLT_EPSILON) {
int changed = FALSE;
if (BLI_rctf_compare(&sms.new_cur, &v2d->cur, FLT_EPSILON) ==
FALSE)
Modified: trunk/blender/source/blender/editors/render/render_opengl.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_opengl.c 2013-07-31
09:17:58 UTC (rev 58758)
+++ trunk/blender/source/blender/editors/render/render_opengl.c 2013-07-31
09:18:40 UTC (rev 58759)
@@ -469,9 +469,7 @@
WM_event_remove_timer(oglrender->wm, oglrender->win,
oglrender->timer);
}
- if (oglrender->win) {
- WM_cursor_restore(oglrender->win);
- }
+ WM_cursor_restore(oglrender->win);
WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, oglrender->scene);
@@ -560,9 +558,7 @@
}
}
- if (oglrender->win) {
- WM_cursor_time(oglrender->win, scene->r.cfra);
- }
+ WM_cursor_time(oglrender->win, scene->r.cfra);
BKE_scene_update_for_newframe(bmain, scene,
screen_opengl_layers(oglrender));
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
2013-07-31 09:17:58 UTC (rev 58758)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
2013-07-31 09:18:40 UTC (rev 58759)
@@ -263,7 +263,7 @@
{
bArmature *arm = (bArmature *)poin;
Bone *bone = (Bone *)poin2;
- if (bone && (bone->flag & BONE_HIDDEN_P))
+ if (bone->flag & BONE_HIDDEN_P)
bone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
if (CTX_wm_window(C)->eventstate->ctrl) {
@@ -277,7 +277,7 @@
{
bArmature *arm = (bArmature *)poin;
Bone *bone = (Bone *)poin2;
- if (bone && (bone->flag & BONE_UNSELECTABLE))
+ if (bone->flag & BONE_UNSELECTABLE)
bone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
if (CTX_wm_window(C)->eventstate->ctrl) {
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c
2013-07-31 09:17:58 UTC (rev 58758)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c
2013-07-31 09:18:40 UTC (rev 58759)
@@ -803,7 +803,7 @@
totvert= obr->totvert;
/* we now test all vertices, when faces have a normal too much
different: they get a new vertex */
for (a=0, asv=asverts; a<totvert; a++, asv++) {
- if (asv && asv->totface>1) {
+ if (asv->totface > 1) {
ver= RE_findOrAddVert(obr, a);
asf= asv->faces.first;
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2013-07-31 09:17:58 UTC (rev 58758)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2013-07-31 09:18:40 UTC (rev 58759)
@@ -982,7 +982,7 @@
WM_operator_last_properties_init(op);
}
- if ((G.debug & G_DEBUG_HANDLERS) && event && event->type !=
MOUSEMOVE) {
+ if ((G.debug & G_DEBUG_HANDLERS) && ((event == NULL) ||
(event->type != MOUSEMOVE))) {
printf("%s: handle evt %d win %d op %s\n",
__func__, event ? event->type : 0,
CTX_wm_screen(C)->subwinactive, ot->idname);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
