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/editors/render/render_shading.c
View File

@@ -99,7 +99,6 @@
static int material_slot_add_exec(bContext *C, wmOperator *UNUSED(op))
{
const WorkSpace *workspace = CTX_wm_workspace(C);
Object *ob = ED_object_context(C);
if (!ob)
@@ -107,7 +106,7 @@ static int material_slot_add_exec(bContext *C, wmOperator *UNUSED(op))
BKE_object_material_slot_add(ob);
if (workspace->object_mode & OB_MODE_TEXTURE_PAINT) {
if (ob->mode & OB_MODE_TEXTURE_PAINT) {
Scene *scene = CTX_data_scene(C);
BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL);
WM_event_add_notifier(C, NC_SCENE | ND_TOOLSETTINGS, NULL);
@@ -137,7 +136,6 @@ void OBJECT_OT_material_slot_add(wmOperatorType *ot)
static int material_slot_remove_exec(bContext *C, wmOperator *op)
{
const WorkSpace *workspace = CTX_wm_workspace(C);
Object *ob = ED_object_context(C);
if (!ob)
@@ -151,7 +149,7 @@ static int material_slot_remove_exec(bContext *C, wmOperator *op)
BKE_object_material_slot_remove(ob);
if (workspace->object_mode & OB_MODE_TEXTURE_PAINT) {
if (ob->mode & OB_MODE_TEXTURE_PAINT) {
Scene *scene = CTX_data_scene(C);
BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL);
WM_event_add_notifier(C, NC_SCENE | ND_TOOLSETTINGS, NULL);