diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-04-20 22:48:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-04-20 22:48:30 +0400 |
| commit | c7b1e5c11df31c437834088fc056a27fe852bfe1 (patch) | |
| tree | 0ed49ef356e72fd4f6f7d5f9778cac9fa91c3ea7 /source/blender/src/editmesh_add.c | |
| parent | 94b7743dd3f298fa6c93e541813f43df8a3828d5 (diff) | |
export_fbx.py - support scene start/end frames, fpx, mist settings, better default camera writing.
BPyObject.py - function for getting an objects armature, look at both parent and modifier.
editmesh_add.c and BPyAddMesh.py - check for multires
filesel.c, Append/Link had a bug where files linked in, didnt have the LIB_APPEND_TAG unset, and appending these into a new blend file would link instead.
BKE_library.h, library.c - utility functions for flagging listbases flag_all_listbases_ids and and flag_listbase_ids
Diffstat (limited to 'source/blender/src/editmesh_add.c')
| -rw-r--r-- | source/blender/src/editmesh_add.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/src/editmesh_add.c b/source/blender/src/editmesh_add.c index e90a08e4086..bb1d5d00957 100644 --- a/source/blender/src/editmesh_add.c +++ b/source/blender/src/editmesh_add.c @@ -1183,6 +1183,8 @@ void add_primitiveMesh(int type) if ELEM(curarea->spacetype, SPACE_VIEW3D, SPACE_INFO); else return; if(G.vd==0) return; + if (G.obedit && G.obedit->type==OB_MESH && multires_test()) return; + /* if editmode exists for other type, it exits */ check_editmode(OB_MESH); |