archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Remove workspace object mode, reverts changes w/ 2.8

Browse Source 
This caused too many problems syncing object modes
with multiple objects/windows/workspaces, see: D3130 for details.
This commit is contained in:
Campbell Barton
2018-04-05 18:20:27 +02:00
parent 57329304b0
commit 1c24c04e60
176 changed files with 1373 additions and 2279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/modifiers/intern/MOD_multires.c
View File

@@ -48,8 +48,6 @@
#include "MOD_modifiertypes.h"
#include "DEG_depsgraph.h"
static void initData(ModifierData *md)
{
MultiresModifierData *mmd = (MultiresModifierData *)md;
@@ -69,7 +67,7 @@ static void copyData(ModifierData *md, ModifierData *target)
modifier_copyData_generic(md, target);
}
static DerivedMesh *applyModifier(ModifierData *md, const struct EvaluationContext *eval_ctx, Object *ob,
static DerivedMesh *applyModifier(ModifierData *md, const struct EvaluationContext *UNUSED(eval_ctx), Object *ob,
DerivedMesh *dm, ModifierApplyFlag flag)
{
MultiresModifierData *mmd = (MultiresModifierData *)md;
@@ -96,7 +94,7 @@ static DerivedMesh *applyModifier(ModifierData *md, const struct EvaluationConte
if (ignore_simplify)
flags |= MULTIRES_IGNORE_SIMPLIFY;
result = multires_make_derived_from_derived(dm, mmd, ob, flags, eval_ctx->object_mode);
result = multires_make_derived_from_derived(dm, mmd, ob, flags);
if (result == dm)
return dm;