forked from bartvdbraak/blender
Merge branch 'master' into blender2.8
This commit is contained in:
commit
10e6da1f2d
@ -49,6 +49,13 @@ if(MSVC)
|
||||
CMAKE_ARGS ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF
|
||||
INSTALL_DIR ${LIBDIR}/openjpeg_msvc
|
||||
)
|
||||
if(BUILD_MODE STREQUAL Release)
|
||||
ExternalProject_Add_Step(external_openjpeg_msvc after_install
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/lib ${HARVEST_TARGET}/openjpeg/lib &&
|
||||
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/include ${HARVEST_TARGET}/openjpeg/include
|
||||
DEPENDEES install
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
set(OPENJPEG_LIBRARY libopenjpeg${LIBEXT})
|
||||
|
@ -2804,6 +2804,20 @@ static int graph_driver_delete_invalid_exec(bContext *C, wmOperator *op)
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
|
||||
static int graph_driver_delete_invalid_poll(bContext *C)
|
||||
{
|
||||
bAnimContext ac;
|
||||
ScrArea *sa = CTX_wm_area(C);
|
||||
|
||||
/* firstly, check if in Graph Editor */
|
||||
if ((sa == NULL) || (sa->spacetype != SPACE_IPO))
|
||||
return 0;
|
||||
|
||||
/* try to init Anim-Context stuff ourselves and check */
|
||||
return ANIM_animdata_get_context(C, &ac) != 0;
|
||||
}
|
||||
|
||||
|
||||
void GRAPH_OT_driver_delete_invalid(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
@ -2813,7 +2827,7 @@ void GRAPH_OT_driver_delete_invalid(wmOperatorType *ot)
|
||||
|
||||
/* api callbacks */
|
||||
ot->exec = graph_driver_delete_invalid_exec;
|
||||
ot->poll = graphop_visible_keyframes_poll;
|
||||
ot->poll = graph_driver_delete_invalid_poll;
|
||||
|
||||
/* flags */
|
||||
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
||||
|
Loading…
Reference in New Issue
Block a user