diff options
Diffstat (limited to 'source/blender/windowmanager/intern')
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 2f4abbe20d8..32ef4ca8f95 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -72,7 +72,7 @@ #include "BKE_appdir.h" #include "BKE_sequencer.h" /* free seq clipboard */ #include "BKE_studiolight.h" -#include "BKE_material.h" /* clear_matcopybuf */ +#include "BKE_material.h" /* BKE_material_copybuf_clear */ #include "BKE_tracking.h" /* free tracking clipboard */ #include "BKE_mask.h" /* free mask clipboard */ @@ -350,7 +350,7 @@ void WM_init(bContext *C, int argc, const char **argv) GHOST_toggleConsole(3); } - clear_matcopybuf(); + BKE_material_copybuf_clear(); ED_render_clear_mtex_copybuf(); // glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA); @@ -533,7 +533,7 @@ void WM_exit_ex(bContext *C, const bool do_python) BKE_addon_pref_type_free(); BKE_keyconfig_pref_type_free(); - BKE_material_gpencil_default_free(); + BKE_materials_exit(); wm_operatortype_free(); wm_dropbox_free(); @@ -582,7 +582,7 @@ void WM_exit_ex(bContext *C, const bool do_python) } BKE_blender_free(); /* blender.c, does entire library and spacetypes */ - // free_matcopybuf(); + // BKE_material_copybuf_free(); ANIM_fcurves_copybuf_free(); ANIM_drivers_copybuf_free(); ANIM_driver_vars_copybuf_free(); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 5837e8e952c..051d9959010 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -457,7 +457,7 @@ static const char *wm_context_member_from_ptr(bContext *C, const PointerRNA *ptr } case ID_MA: { # define ID_CAST_OBMATACT(id_pt) \ - (give_current_material(((Object *)id_pt), ((Object *)id_pt)->actcol)) + (BKE_object_material_get(((Object *)id_pt), ((Object *)id_pt)->actcol)) CTX_TEST_PTR_ID_CAST( C, "object", "object.active_material", ID_CAST_OBMATACT, ptr->owner_id); break; |