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:
authorBastien Montagne <montagne29@wanadoo.fr>2014-11-30 19:18:03 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2014-11-30 19:21:39 +0300
commitfd4cd626be9542a58fe5b30bf9409d5e435ff140 (patch)
treeb152e25ce25976bc22a065a3b8b4e428bb1fe579 /source/blender/editors/space_node/node_add.c
parent503dbb65c02b0cd0d80f0cbed6419285162b3262 (diff)
More fixes related to D&D:
* Same issue as T42760 was also reproducible in some cases in 3DView. * You got an error message about missing RNA prop in some drop-called operators. * You could not drop a movie file in nodes, (some cases of) 3DView, nor ImageEditor.
Diffstat (limited to 'source/blender/editors/space_node/node_add.c')
-rw-r--r--source/blender/editors/space_node/node_add.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_add.c b/source/blender/editors/space_node/node_add.c
index bb7d1f50d7b..c3064432131 100644
--- a/source/blender/editors/space_node/node_add.c
+++ b/source/blender/editors/space_node/node_add.c
@@ -374,7 +374,7 @@ void NODE_OT_add_file(wmOperatorType *ot)
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
- WM_operator_properties_filesel(ot, FOLDERFILE | IMAGEFILE, FILE_SPECIAL, FILE_OPENFILE,
+ WM_operator_properties_filesel(ot, FOLDERFILE | IMAGEFILE | MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE,
WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
RNA_def_string(ot->srna, "name", "Image", MAX_ID_NAME - 2, "Name", "Datablock name to assign");
}