diff options
Diffstat (limited to 'source/blender/editors/object/object_bake_api.c')
| -rw-r--r-- | source/blender/editors/object/object_bake_api.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index acecbc47c28..7d39d2546b6 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -23,23 +23,23 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" -#include "DNA_mesh_types.h" #include "DNA_material_types.h" +#include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" -#include "BLI_listbase.h" #include "BLI_fileops.h" +#include "BLI_listbase.h" #include "BLI_path_util.h" #include "BKE_context.h" #include "BKE_global.h" #include "BKE_image.h" #include "BKE_layer.h" -#include "BKE_library.h" +#include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mesh.h" @@ -57,9 +57,9 @@ #include "RE_engine.h" #include "RE_pipeline.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "WM_api.h" #include "WM_types.h" @@ -143,7 +143,7 @@ static int bake_modal(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) /* running render */ switch (event->type) { - case ESCKEY: { + case EVT_ESCKEY: { G.is_break = true; return OPERATOR_RUNNING_MODAL; } @@ -481,7 +481,7 @@ static bool bake_object_check(ViewLayer *view_layer, Object *ob, ReportList *rep } } else { - Material *mat = give_current_material(ob, i); + Material *mat = BKE_object_material_get(ob, i); if (mat != NULL) { BKE_reportf(reports, RPT_INFO, |