Commit: 43584f4a41cb986fbe13bf193fecdde41d23a4da
Author: Campbell Barton
Date: Tue May 29 15:16:07 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB43584f4a41cb986fbe13bf193fecdde41d23a4da
Missed own last commit
===================================================================
M source/blender/draw/modes/pose_mode.c
M source/blender/editors/space_view3d/view3d_select.c
===================================================================
diff --git a/source/blender/draw/modes/pose_mode.c
b/source/blender/draw/modes/pose_mode.c
index 1fe6549c73c..586fb590ebf 100644
--- a/source/blender/draw/modes/pose_mode.c
+++ b/source/blender/draw/modes/pose_mode.c
@@ -224,7 +224,7 @@ bool DRW_pose_mode_armature(Object *ob, Object *active_ob)
const DRWContextState *draw_ctx = DRW_context_state_get();
/* Pose armature is handled by pose mode engine. */
- if (((ob == active_ob) || (ob->base_flag & BASE_SELECTED)) &&
+ if (((ob == active_ob) || (ob->mode & OB_MODE_POSE)) &&
((draw_ctx->object_mode & OB_MODE_POSE) != 0))
{
return true;
diff --git a/source/blender/editors/space_view3d/view3d_select.c
b/source/blender/editors/space_view3d/view3d_select.c
index be5653a3021..652fdd4b449 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -106,6 +106,9 @@
// #include "PIL_time_utildefines.h"
+/* Don't allow switching object-modes when selecting objects. */
+#define USE_OBJECT_MODE_STRICT
+
float ED_view3d_select_dist_px(void)
{
return 75.0f * U.pixelsize;
@@ -1249,6 +1252,25 @@ static int mixed_bones_object_selectbuffer(
finally:
view3d_opengl_select_cache_end();
+#ifdef USE_OBJECT_MODE_STRICT
+ {
+ const bool is_pose_mode = (vc->obact && vc->obact->mode &
OB_MODE_POSE);
+ struct {
+ uint data[4];
+ } *buffer4 = (void *)buffer;
+ uint j = 0;
+ for (uint i = 0; i < hits; i++) {
+ if (((buffer4[i].data[3] & 0xFFFF0000) != 0) ==
is_pose_mode) {
+ if (i != j) {
+ buffer4[i] = buffer4[j];
+ }
+ j++;
+ }
+ }
+ hits = j;
+ }
+#endif
+
return hits;
}
@@ -1467,7 +1489,7 @@ static bool ed_object_select_pick(
else {
basact = mouse_select_eval_buffer(&vc, buffer,
hits, startbase, has_bones, do_nearest);
}
-
+
if (has_bones && basact) {
if (basact->object->type == OB_CAMERA) {
if (BASACT(view_layer) == basact) {
@@ -1554,7 +1576,22 @@ static bool ed_object_select_pick(
}
}
}
-
+
+#ifdef USE_OBJECT_MODE_STRICT
+ /* Disallow switching modes,
+ * special exception for edit-mode - vertex-parent operator. */
+ if (is_obedit == false) {
+ oldbasact = BASACT(view_layer);
+ if (oldbasact && basact) {
+ if ((oldbasact->object->mode != basact->object->mode) &&
+ (oldbasact->object->mode & basact->object->mode) ==
0)
+ {
+ basact = NULL;
+ }
+ }
+ }
+#endif
+
/* so, do we have something selected? */
if (basact) {
retval = true;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
