archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: 'area' vs 'region'

Browse Source 
Apparently this is the result of some sloppiness during 2.5 project and since then it confused people who were trying to understand the area-region relation (myself included).

Sorry if this causes merge conflicts for anyone, but at some point we really had to do it :/
This commit is contained in:
Julian Eisel
2015-11-28 17:14:45 +01:00
parent 51f996836c
commit 175110ec87
30 changed files with 425 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_nla/nla_channels.c
View File

@@ -268,7 +268,7 @@ static int mouse_nla_channels(bContext *C, bAnimContext *ac, float x, int channe
{
AnimData *adt = BKE_animdata_from_id(ale->id);
/* button area... */
/* button region... */
if (x >= (v2d->cur.xmax - NLACHANNEL_BUTTON_WIDTH)) {
if (nlaedit_is_tweakmode_on(ac) == 0) {
/* 'push-down' action - only usable when not in TweakMode */