diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-03-19 08:09:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-03-19 08:09:56 +0300 |
| commit | 4f5065ac98bc135c20dfc04cf596d6dd19cb214e (patch) | |
| tree | 7cc2816b6e9c1ac92f7a7f2bd783a0501269be83 /source/blender/include/blendef.h | |
| parent | 9477a7bc5c30019dcb1c4b2a3ec646c3b712146f (diff) | |
addad e new macro - BASE_SELECTABLE for checking if an object is selectable (restrict visible and restrict selected are off and its in the current view layer)
Made "Select Grouped" functions and "Select Linked" use BASE_SELECTABLE macro so they wont select objects they shouldent.
Made "Select Grouped" push an undo
Made "Select Grouped" and "Select Linked" only push add an UNDO if they make a change to the selection.
Fix for own bug. "Select Group" -> Hooks option could crash blender if an objetc hook was in another scene.
Diffstat (limited to 'source/blender/include/blendef.h')
| -rw-r--r-- | source/blender/include/blendef.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h index 33d3d7fa4c6..20b5f4a5da6 100644 --- a/source/blender/include/blendef.h +++ b/source/blender/include/blendef.h @@ -97,6 +97,7 @@ #define TESTBASE(base) ( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) ) #define TESTBASELIB(base) ( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) && ((base)->object->id.lib==0)) +#define BASE_SELECTABLE(base) ((base->lay & G.vd->lay) && !(base->object->restrictflag & OB_RESTRICT_SELECT) && !(base->object->restrictflag & OB_RESTRICT_VIEW)) #define FIRSTBASE G.scene->base.first #define LASTBASE G.scene->base.last #define BASACT (G.scene->basact) |