Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Yurkovich <jesse.y@gmail.com>2021-09-28 07:00:17 +0300
committerJesse Yurkovich <jesse.y@gmail.com>2021-09-28 07:00:17 +0300
commit986d60490c0694941e27c070780c55f07b7b4842 (patch)
tree136f75c5144e50498b329773dec14feb4155ce52 /source/blender/editors/space_view3d/view3d_edit.c
parentc53ffda8a496989c4e523085ed5440e89b59001c (diff)
Asset Browser: Allow World assets to be drag/dropped onto the viewport
While World data has always been able to be marked as an asset, there was no way to actually use them from the asset browser. This change allows users to drag-drop world assets onto the Viewport and have them appended/linked to their scene. Differential Revision: https://developer.blender.org/D12566
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_edit.c')
-rw-r--r--source/blender/editors/space_view3d/view3d_edit.c54
1 files changed, 54 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index d917674194a..15ccf5891d4 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -34,6 +34,7 @@
#include "DNA_gpencil_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
+#include "DNA_world_types.h"
#include "MEM_guardedalloc.h"
@@ -4874,6 +4875,59 @@ void VIEW3D_OT_background_image_remove(wmOperatorType *ot)
/** \} */
/* -------------------------------------------------------------------- */
+/** \name Drop World Operator
+ * \{ */
+
+static int drop_world_exec(bContext *C, wmOperator *op)
+{
+ Main *bmain = CTX_data_main(C);
+ Scene *scene = CTX_data_scene(C);
+
+ char name[MAX_ID_NAME - 2];
+
+ RNA_string_get(op->ptr, "name", name);
+ World *world = (World *)BKE_libblock_find_name(bmain, ID_WO, name);
+ if (world == NULL) {
+ return OPERATOR_CANCELLED;
+ }
+
+ id_us_plus(&world->id);
+ scene->world = world;
+
+ DEG_id_tag_update(&scene->id, 0);
+ DEG_relations_tag_update(bmain);
+
+ WM_event_add_notifier(C, NC_SCENE | ND_WORLD, scene);
+
+ return OPERATOR_FINISHED;
+}
+
+static bool drop_world_poll(bContext *C)
+{
+ return ED_operator_scene_editable(C);
+}
+
+void VIEW3D_OT_drop_world(wmOperatorType *ot)
+{
+ /* identifiers */
+ ot->name = "Drop World";
+ ot->description = "Drop a world into the scene";
+ ot->idname = "VIEW3D_OT_drop_world";
+
+ /* api callbacks */
+ ot->exec = drop_world_exec;
+ ot->poll = drop_world_poll;
+
+ /* flags */
+ ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL;
+
+ /* properties */
+ RNA_def_string(ot->srna, "name", "World", MAX_ID_NAME - 2, "Name", "World to assign");
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
/** \name View Clipping Planes Operator
*
* Draw border or toggle off.