diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-04-08 20:56:44 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-04-08 20:56:44 +0400 |
| commit | 1728c20a63123f1377f7192c1bd521286eac2228 (patch) | |
| tree | 376d979006aca8fee63e880c2120b655c7bcf833 /source/blender/editors/render | |
| parent | 626c26809624305a936b87485ee1123136ada658 (diff) | |
Fixes related to using Library files:
- Assigning local materials to library objects disabled
(crashes on undo/redo cases)
- Disabling options in Material buttons to add/remove slots
on library data
- Drawing Object ID template in Object properties, this
allows browse active Object, but especially shows library
status then.
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_shading.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 2fe8533c04c..306e9f977de 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -76,9 +76,10 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_render.h" #include "ED_curve.h" #include "ED_mesh.h" +#include "ED_render.h" +#include "ED_screen.h" #include "RNA_define.h" @@ -285,6 +286,7 @@ void OBJECT_OT_material_slot_add(wmOperatorType *ot) /* api callbacks */ ot->exec= material_slot_add_exec; + ot->poll= ED_operator_object_active_editable; /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -320,6 +322,7 @@ void OBJECT_OT_material_slot_remove(wmOperatorType *ot) /* api callbacks */ ot->exec= material_slot_remove_exec; + ot->poll= ED_operator_object_active_editable; /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; @@ -379,6 +382,7 @@ void OBJECT_OT_material_slot_assign(wmOperatorType *ot) /* api callbacks */ ot->exec= material_slot_assign_exec; + ot->poll= ED_operator_object_active_editable; /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; |