Commit: f6a43e07abe8d79064f8df7fe9fd71d89e1af5fc
Author: Julian Eisel
Date: Sat Dec 31 02:11:48 2016 +0100
Branches: workspaces
https://developer.blender.org/rBf6a43e07abe8d79064f8df7fe9fd71d89e1af5fc
Merge branch 'blender2.8' into workspaces
Conflicts:
source/blender/editors/space_outliner/outliner_intern.h
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_library.h
index 2d9c35f,2d9c35f..2e50b0f
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@@ -95,7 -95,7 +95,7 @@@ void id_clear_lib_data_ex(struct Main *
struct ListBase *which_libbase(struct Main *mainlib, short type);
--#define MAX_LIBARRAY 35
++#define MAX_LIBARRAY 36
int set_listbasepointers(struct Main *main, struct ListBase
*lb[MAX_LIBARRAY]);
/* Main API */
diff --cc source/blender/blenloader/intern/writefile.c
index 3659bf5,27db830..5802b1d
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -169,8 -170,8 +170,9 @@@
#include "BKE_subsurf.h"
#include "BKE_modifier.h"
#include "BKE_fcurve.h"
+ #include "BKE_pointcache.h"
#include "BKE_mesh.h"
+#include "BKE_workspace.h"
#ifdef USE_NODE_COMPAT_CUSTOMNODES
#include "NOD_socket.h" /* for sock->default_value data */
diff --cc source/blender/editors/interface/interface_templates.c
index 1045fd5,2cdcf7a..6ba56c5
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@@ -572,9 -538,9 +574,10 @@@ static void template_ID
BLT_I18NCONTEXT_ID_ACTION,
BLT_I18NCONTEXT_ID_NODETREE,
BLT_I18NCONTEXT_ID_BRUSH,
+
BLT_I18NCONTEXT_ID_PARTICLESETTINGS,
BLT_I18NCONTEXT_ID_GPENCIL,
BLT_I18NCONTEXT_ID_FREESTYLELINESTYLE,
+ BLT_I18NCONTEXT_ID_WORKSPACE,
);
if (newop) {
diff --cc source/blender/editors/space_outliner/outliner_intern.h
index 3e5efb7,f23c294..52f4695
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@@ -61,8 -61,8 +61,8 @@@ typedef struct TreeElement
#define TREESTORE_ID_TYPE(_id) \
(ELEM(GS((_id)->name), ID_SCE, ID_LI, ID_OB, ID_ME, ID_CU, ID_MB,
ID_NT, ID_MA, ID_TE, ID_IM, ID_LT, ID_LA, ID_CA) || \
- ELEM(GS((_id)->name), ID_KE, ID_WO, ID_SPK, ID_GR, ID_AR, ID_AC,
ID_BR, ID_GD, ID_LS) || \
+ ELEM(GS((_id)->name), ID_KE, ID_WO, ID_SPK, ID_GR, ID_AR, ID_AC,
ID_BR, ID_PA, ID_GD, ID_LS) || \
- ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF,
ID_PAL)) /* Only in 'blendfile' mode ... :/ */
+ ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF,
ID_PAL, ID_WS)) /* Only in 'blendfile' mode ... :/ */
/* TreeElement->flag */
enum {
diff --cc source/blender/editors/util/CMakeLists.txt
index b9a53ee,c0b30f9..766f70d
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@@ -72,9 -72,9 +72,10 @@@ set(SR
../include/ED_object.h
../include/ED_outliner.h
../include/ED_paint.h
+ ../include/ED_particle.h
../include/ED_physics.h
../include/ED_render.h
+ ../include/ED_scene.h
../include/ED_screen.h
../include/ED_screen_types.h
../include/ED_sculpt.h
diff --cc source/blender/makesrna/intern/rna_main_api.c
index 46666ea,244820f..f6278e1
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@@ -114,9 -115,14 +116,16 @@@
# include "BPY_extern.h"
#endif
+#include "WM_api.h"
+
+ static void rna_idname_validate(const char *name, char *r_name)
+ {
+ BLI_strncpy(r_name, name, MAX_ID_NAME - 2);
+ BLI_utf8_invalid_strip(r_name, strlen(r_name));
+ }
+
+
static void rna_Main_ID_remove(Main *bmain, ReportList *reports, PointerRNA
*id_ptr, int do_unlink)
{
ID *id = id_ptr->data;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
