Commit: b57d67dfb9583fd6adbf7b63889f5f4c79d7bed8
Author: Antony Riakiotakis
Date: Mon Dec 1 14:54:28 2014 +0100
Branches: gooseberry
https://developer.blender.org/rBb57d67dfb9583fd6adbf7b63889f5f4c79d7bed8
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenkernel/BKE_context.h
source/blender/editors/include/ED_transform.h
source/blender/editors/transform/transform_ops.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_context.h
index ebc2466,ae0ef9c..f5fd7ac
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@@ -56,7 -56,9 +56,10 @@@ struct Text
struct ImBuf;
struct EditBone;
struct bPoseChannel;
+ struct bGPdata;
+ struct bGPDlayer;
+ struct bGPDframe;
+struct wmWidget;
struct wmWindow;
struct wmWindowManager;
struct SpaceText;
diff --cc source/blender/editors/space_view3d/view3d_edit.c
index e42eda5,8ee6c7d..9b6b33f
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@@ -4371,10 -4371,10 +4371,10 @@@ void VIEW3D_OT_background_image_add(wmO
/* flags */
ot->flag = 0;
-
+
/* properties */
RNA_def_string(ot->srna, "name", "Image", MAX_ID_NAME - 2, "Name",
"Image name to assign");
- 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);
}
diff --cc source/blender/gpu/intern/gpu_extensions.c
index ff322d8,036ea0d..b4b480e
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@@ -47,10 -47,8 +47,9 @@@
#include "GPU_draw.h"
#include "GPU_extensions.h"
+#include "GPU_compositing.h"
#include "GPU_simple_shader.h"
- #include "intern/gpu_codegen.h"
#include "intern/gpu_extensions_private.h"
#include <stdlib.h>
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
