diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-17 18:38:31 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-26 16:13:38 +0300 |
commit | 4f91f81e0245a92f37e2024136278b57404b00c6 (patch) | |
tree | 3077dc1b9717ed3f1f80093ce940ba8c2b667db4 /source | |
parent | ea5c14092614c3ae22c9ba6fa82f72677048eba1 (diff) |
Removed the explicit duplicache rebuild operator.
The cache is now updated on frame changes automatically, the operator
should no longer be needed.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/io/io_cache_library.c | 40 | ||||
-rw-r--r-- | source/blender/editors/io/io_cache_library.h | 1 | ||||
-rw-r--r-- | source/blender/editors/io/io_ops.c | 1 |
3 files changed, 0 insertions, 42 deletions
diff --git a/source/blender/editors/io/io_cache_library.c b/source/blender/editors/io/io_cache_library.c index faf1d6a64d3..28f2fc9b218 100644 --- a/source/blender/editors/io/io_cache_library.c +++ b/source/blender/editors/io/io_cache_library.c @@ -581,43 +581,3 @@ void CACHELIBRARY_OT_archive_info(wmOperatorType *ot) RNA_def_boolean(ot->srna, "use_popup", false, "Show Popup", "Display archive info in a popup"); RNA_def_boolean(ot->srna, "use_clipboard", false, "Copy to Clipboard", "Copy archive info to the clipboard"); } - -/* ========================================================================= */ - -static int cache_library_rebuild_dupligroup_poll(bContext *C) -{ - Object *ob = CTX_data_active_object(C); - - if (!(ob && (ob->transflag & OB_DUPLIGROUP) && ob->dup_group)) - return false; - - return true; -} - -static int cache_library_rebuild_dupligroup_exec(bContext *C, wmOperator *UNUSED(op)) -{ - Scene *scene = CTX_data_scene(C); - Object *ob = CTX_data_active_object(C); - EvaluationContext eval_ctx; - - eval_ctx.mode = DAG_EVAL_VIEWPORT; - - BKE_object_dupli_cache_update(scene, ob, &eval_ctx, (float)scene->r.cfra); - - return OPERATOR_FINISHED; -} - -void CACHELIBRARY_OT_rebuild_dupligroup(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Rebuild Dupligroup"; - ot->description = "Explicitly rebuild dupligroup from cache"; - ot->idname = "CACHELIBRARY_OT_rebuild_dupligroup"; - - /* api callbacks */ - ot->exec = cache_library_rebuild_dupligroup_exec; - ot->poll = cache_library_rebuild_dupligroup_poll; - - /* flags */ - ot->flag = OPTYPE_REGISTER; -} diff --git a/source/blender/editors/io/io_cache_library.h b/source/blender/editors/io/io_cache_library.h index 72b45ee5c37..29c2e683c5e 100644 --- a/source/blender/editors/io/io_cache_library.h +++ b/source/blender/editors/io/io_cache_library.h @@ -38,7 +38,6 @@ void CACHELIBRARY_OT_delete(struct wmOperatorType *ot); void CACHELIBRARY_OT_item_enable(struct wmOperatorType *ot); void CACHELIBRARY_OT_bake(struct wmOperatorType *ot); -void CACHELIBRARY_OT_rebuild_dupligroup(struct wmOperatorType *ot); void CACHELIBRARY_OT_archive_info(struct wmOperatorType *ot); diff --git a/source/blender/editors/io/io_ops.c b/source/blender/editors/io/io_ops.c index de6d6751c47..4f4d3e7d9f6 100644 --- a/source/blender/editors/io/io_ops.c +++ b/source/blender/editors/io/io_ops.c @@ -43,7 +43,6 @@ void ED_operatortypes_io(void) WM_operatortype_append(CACHELIBRARY_OT_delete); WM_operatortype_append(CACHELIBRARY_OT_item_enable); WM_operatortype_append(CACHELIBRARY_OT_bake); - WM_operatortype_append(CACHELIBRARY_OT_rebuild_dupligroup); WM_operatortype_append(CACHELIBRARY_OT_archive_info); #ifdef WITH_COLLADA |