diff options
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index a82037ead11..ebc3ad89c95 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -35,8 +35,6 @@ #include <string.h> #include <math.h> -#include "MEM_guardedalloc.h" - #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_lattice_types.h" @@ -50,6 +48,8 @@ #include "DNA_scene_types.h" #include "DNA_meshdata_types.h" +#include "MEM_guardedalloc.h" + #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_context.h" @@ -69,7 +69,6 @@ #include "BKE_bmesh.h" #include "BKE_scene.h" -#include "BIF_gl.h" #include "ED_anim_api.h" #include "ED_armature.h" @@ -4371,7 +4370,11 @@ static void set_trans_object_base_flags(bContext *C, TransInfo *t) /* if parent selected, deselect */ while(parsel) { - if(parsel->flag & SELECT) break; + if(parsel->flag & SELECT) { + Base *parbase = object_in_scene(parsel, scene); + if TESTBASELIB_BGMODE(v3d, scene, parbase) + break; + } parsel= parsel->parent; } |