[Bf-blender-cvs] [f9d6b3565d1] greasepencil-object: Fix compiler error after merge

[Antonio Vazquez]

Commit: f9d6b3565d12dcb0a1f56b649f3c22245142b6dd
Author: Antonio Vazquez
Date:   Fri Feb 9 17:09:12 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBf9d6b3565d12dcb0a1f56b649f3c22245142b6dd

Fix compiler error after merge

===================================================================

M       source/blender/editors/object/object_modifier.c

===================================================================

diff --git a/source/blender/editors/object/object_modifier.c 
b/source/blender/editors/object/object_modifier.c
index 8d0ef2c4d52..251d6ff8de5 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -716,7 +716,7 @@ int ED_object_modifier_apply(ReportList *reports, const 
bContext *C, Scene *scen
                return 0;
        }
        else if (ob->type == OB_GPENCIL) {
-               if (eval_ctx.object_mode != OB_MODE_OBJECT) {
+               if (workspace->object_mode != OB_MODE_OBJECT) {
                        BKE_report(reports, RPT_ERROR, "Modifiers cannot be 
applied in paint, sculpt or edit mode");
                        return 0;
                }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs