diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-12-21 16:16:13 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-21 16:16:13 +0400 |
commit | f25618f29a65277039a11c021981dab487b96966 (patch) | |
tree | 77afa4c87f0b6e53694c490c9fbea5c30dfe71b5 /source | |
parent | 915f78af928d4ec0ec8cae5bca2710acee5cf3ea (diff) |
make Node.links return a tuple, this may you can't do socket.links.append() by mistake.
removed RNAMeta mixin class since you cant register subclasses.
also some minor code cleanup
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_array.h | 4 | ||||
-rw-r--r-- | source/blender/compositor/operations/COM_TrackPositionOperation.cpp | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index f9bbf0dcc53..8826f86d72a 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1925,7 +1925,7 @@ static void give_parvert(Object *par, int nr, float vec[3]) } else if (ELEM(par->type, OB_CURVE, OB_SURF)) { Curve *cu = par->data; - ListBase *nurb = BKE_curve_nurbs_get(cu);; + ListBase *nurb = BKE_curve_nurbs_get(cu); BKE_nurbList_index_get_co(nurb, nr, vec); } diff --git a/source/blender/blenlib/BLI_array.h b/source/blender/blenlib/BLI_array.h index 6d34b0d48d5..7c8816cb58a 100644 --- a/source/blender/blenlib/BLI_array.h +++ b/source/blender/blenlib/BLI_array.h @@ -106,8 +106,8 @@ ((arr = (void *)_##arr##_static), (_##arr##_count += (num))) \ : \ /* use existing static array or allocate */ \ - ((BLI_array_totalsize(arr) >= _##arr##_count + num) ? \ - (_##arr##_count += num) : \ + (LIKELY(BLI_array_totalsize(arr) >= _##arr##_count + num) ? \ + (_##arr##_count += num) : /* UNLIKELY --> realloc */ \ ( \ (void) (_##arr##_tmp = MEM_callocN( \ sizeof(*arr) * (num < _##arr##_count ? \ diff --git a/source/blender/compositor/operations/COM_TrackPositionOperation.cpp b/source/blender/compositor/operations/COM_TrackPositionOperation.cpp index 8b5288321c1..e647ae975ff 100644 --- a/source/blender/compositor/operations/COM_TrackPositionOperation.cpp +++ b/source/blender/compositor/operations/COM_TrackPositionOperation.cpp @@ -42,7 +42,7 @@ TrackPositionOperation::TrackPositionOperation() : NodeOperation() this->m_trackingObjectName[0] = 0; this->m_trackName[0] = 0; this->m_axis = 0; - this->m_position = POSITION_ABSOLUTE;; + this->m_position = POSITION_ABSOLUTE; this->m_relativeFrame = 0; } diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index 11cf1088280..dbd722c80dd 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -796,7 +796,7 @@ void wm_draw_update(bContext *C) GPU_free_unused_buffers(); for (win = wm->windows.first; win; win = win->next) { - int state = GHOST_GetWindowState(win->ghostwin);; + int state = GHOST_GetWindowState(win->ghostwin); if (state == GHOST_kWindowStateMinimized) { /* do not update minimized windows, it gives issues on intel drivers (see [#33223]) |