Commit: ee93194f9c016d547dd70e601a2e35482ae969ec
Author: Antonio Vazquez
Date: Wed Feb 28 18:34:04 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBee93194f9c016d547dd70e601a2e35482ae969ec
Fix missing line after merge
===================================================================
M source/blender/editors/object/object_select.c
===================================================================
diff --git a/source/blender/editors/object/object_select.c
b/source/blender/editors/object/object_select.c
index 13f3e4c0527..b641fb57a13 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -144,7 +144,7 @@ void ED_object_base_activate(bContext *C, Base *base)
Object *ob_prev = OBACT(view_layer);
Object *ob_curr = base->object;
if (ob_prev != NULL) {
- if (ob_prev->type == ob_curr->type) {
+ if ((ob_prev->type == ob_curr->type) ||
(ob_curr->type == OB_GPENCIL)) {
reset = false;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
