blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

UI: use force icon for objects in outliner, fix missing redraw when changing type 

Differential Revision: https://developer.blender.org/D5008
This commit is contained in:
Alessio Monti di Sopra 2019-06-21 18:22:53 +02:00 committed by Brecht Van Lommel
parent 9bbd9d9b3b
commit f9e4568550
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/object/object_edit.c
View File

@ -869,6 +869,8 @@ static int forcefield_toggle_exec(bContext *C, wmOperator *UNUSED(op))
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
return OPERATOR_FINISHED;
}

4
source/blender/editors/space_outliner/outliner_draw.c
View File

@ -31,6 +31,7 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_sequence_types.h"
#include "DNA_object_force_types.h"
#include "BLI_math.h"
#include "BLI_blenlib.h"
@ -2207,6 +2208,9 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te)
else if (ob->empty_drawtype == OB_EMPTY_IMAGE) {
data.icon = ICON_OUTLINER_OB_IMAGE;
}
else if (ob->pd && ob->pd->forcefield) {
data.icon = ICON_OUTLINER_OB_FORCE_FIELD;
}
else {
data.icon = ICON_OUTLINER_OB_EMPTY;
}