[Bf-blender-cvs] [ab3cfa3] soc-2016-layer_manager: Remove build option WITH_ADVANCED_LAYERS
Julian Eisel
noreply at git.blender.org
Wed Jul 13 17:11:05 CEST 2016
Commit: ab3cfa36f52cc29dab8920823c85644d6a262bfa
Author: Julian Eisel
Date: Wed Jul 13 17:10:04 2016 +0200
Branches: soc-2016-layer_manager
https://developer.blender.org/rBab3cfa36f52cc29dab8920823c85644d6a262bfa
Remove build option WITH_ADVANCED_LAYERS
So far this hasn't been useful at all, only causing trouble.
===================================================================
M CMakeLists.txt
M release/scripts/startup/bl_ui/__init__.py
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/blender.c
M source/blender/blenkernel/intern/context.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenloader/CMakeLists.txt
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/CMakeLists.txt
M source/blender/editors/include/ED_space_api.h
M source/blender/editors/interface/CMakeLists.txt
M source/blender/editors/interface/resources.c
M source/blender/editors/object/CMakeLists.txt
M source/blender/editors/object/object_add.c
M source/blender/editors/scene/CMakeLists.txt
M source/blender/editors/screen/CMakeLists.txt
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/space_api/CMakeLists.txt
M source/blender/editors/space_api/spacetypes.c
M source/blender/editors/space_layers/CMakeLists.txt
M source/blender/editors/space_view3d/CMakeLists.txt
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/makesrna/intern/rna_space.c
M source/blender/python/intern/CMakeLists.txt
M source/blender/python/intern/bpy_app_build_options.c
M source/blender/windowmanager/CMakeLists.txt
M source/blender/windowmanager/intern/wm_init_exit.c
M source/blender/windowmanager/intern/wm_keymap.c
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81e5554..1c933d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -502,10 +502,6 @@ mark_as_advanced(WITH_CXX11)
option(WITH_LEGACY_DEPSGRAPH "Build Blender with legacy dependency graph" ON)
mark_as_advanced(WITH_LEGACY_DEPSGRAPH)
-# Layer manager
-option(WITH_ADVANCED_LAYERS "Use the advanced layer manager system for the build (WIP feature)" ON)
-mark_as_advanced(WITH_ADVANCED_LAYERS)
-
# avoid using again
option_defaults_clear()
diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py
index 44ec902..53c0c9e 100644
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -69,6 +69,7 @@ _modules = [
"space_graph",
"space_image",
"space_info",
+ "space_layers",
"space_logic",
"space_nla",
"space_node",
@@ -87,9 +88,6 @@ import bpy
if bpy.app.build_options.freestyle:
_modules.append("properties_freestyle")
-if bpy.app.build_options.advanced_layers:
- _modules.append("space_layers")
-
__import__(name=__name__, fromlist=_modules)
_namespace = globals()
_modules_loaded = [_namespace[name] for name in _modules]
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 2bcb7d4..e25030c 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -162,9 +162,7 @@ struct SpaceAction *CTX_wm_space_action(const bContext *C);
struct SpaceInfo *CTX_wm_space_info(const bContext *C);
struct SpaceUserPref *CTX_wm_space_userpref(const bContext *C);
struct SpaceClip *CTX_wm_space_clip(const bContext *C);
-//#ifdef WITH_ADVANCED_LAYERS
struct SpaceLayers *CTX_wm_space_layers(const bContext *C);
-//#endif
void CTX_wm_manager_set(bContext *C, struct wmWindowManager *wm);
void CTX_wm_window_set(bContext *C, struct wmWindow *win);
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 2554761..0a76294 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -272,25 +272,18 @@ bool BKE_object_modifier_update_subframe(struct Scene *scene, struct Object *ob,
/* -------------------------------------------------------------------- */
/* Object Layers */
-#ifdef WITH_ADVANCED_LAYERS
#define BKE_OBJECTLAYER_BASES_ITER_START(oblayer, idx_name, base_name) \
for (unsigned int idx_name = 0; idx_name < oblayer->tot_bases; idx_name++) { \
Base *base_name = oblayer->bases[idx_name];
#define BKE_OBJECTLAYER_BASES_ITER_END } (void)0
-#endif
/* Use this if BKE_BASES_ITER_START doesn't give enough control over variable names.*/
-#ifdef WITH_ADVANCED_LAYERS
- #define BKE_BASES_ITER_START_EX(scene, layeridx_name, litem_name, oblayer_name, baseidx_name, base_name) \
+#define BKE_BASES_ITER_START_EX(scene, layeridx_name, litem_name, oblayer_name, baseidx_name, base_name) \
BKE_LAYERTREE_ITER_START(scene->object_layers, 0, layeridx_name, litem_name) \
{ \
if (litem_name->type->type == LAYER_ITEMTYPE_LAYER) { \
LayerTypeObject *oblayer_name = (LayerTypeObject *)litem_name; \
BKE_OBJECTLAYER_BASES_ITER_START(oblayer_name, baseidx_name, base_name)
-#else
- #define BKE_BASES_ITER_START_EX(scene, layeridx_name, litem_name, oblayer_name, baseidx_name, base_name) \
- for (Base *base_name = scene->base.first; base_name; base_name = base_name->next) {
-#endif /* WITH_ADVANCED_LAYERS */
/* Start iterating over all bases of the scene. This is basically a wrapper around layer
* tree and object layer iterator to make access a bit easier. Uses default variable names. */
@@ -298,15 +291,11 @@ bool BKE_object_modifier_update_subframe(struct Scene *scene, struct Object *ob,
BKE_BASES_ITER_START_EX(scene, i, litem, oblayer, j, base)
/* End BKE_BASES_ITER_START or BKE_BASES_ITER_START_EX. */
-#ifdef WITH_ADVANCED_LAYERS
- #define BKE_BASES_ITER_END \
+#define BKE_BASES_ITER_END \
BKE_OBJECTLAYER_BASES_ITER_END; \
} \
} \
BKE_LAYERTREE_ITER_END /* ends with (void)0 */
-#else
- #define BKE_BASES_ITER_END } (void)0
-#endif
struct LayerTreeItem *BKE_objectlayer_add(struct LayerTree *tree, struct LayerTreeItem *parent, const char *name);
void BKE_objectlayer_free(struct LayerTreeItem *litem);
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index c4efdb7..f557458 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -117,6 +117,7 @@ set(SRC
intern/key.c
intern/lamp.c
intern/lattice.c
+ intern/layer.c
intern/library.c
intern/library_idmap.c
intern/library_query.c
@@ -142,6 +143,7 @@ set(SRC
intern/object.c
intern/object_deform.c
intern/object_dupli.c
+ intern/object_layer.c
intern/object_update.c
intern/ocean.c
intern/outliner_treehash.c
@@ -242,6 +244,7 @@ set(SRC
BKE_key.h
BKE_lamp.h
BKE_lattice.h
+ BKE_layer.h
BKE_library.h
BKE_library_idmap.h
BKE_library_query.h
@@ -530,13 +533,4 @@ if(WITH_LEGACY_DEPSGRAPH)
add_definitions(-DWITH_LEGACY_DEPSGRAPH)
endif()
-if(WITH_ADVANCED_LAYERS)
- add_definitions(-DWITH_ADVANCED_LAYERS)
- list(APPEND SRC
- intern/layer.c
- intern/object_layer.c
- BKE_layer.h
- )
-endif()
-
blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 2699705..8d764e9 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -82,9 +82,7 @@ void BKE_blender_free(void)
BKE_main_free(G.main);
G.main = NULL;
-#ifdef WITH_ADVANCED_LAYERS
BKE_layertypes_free();
-#endif
BKE_spacetypes_free(); /* after free main, it uses space callbacks */
IMB_exit();
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 53496ef..b0ae0ee 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -813,7 +813,6 @@ struct SpaceClip *CTX_wm_space_clip(const bContext *C)
return NULL;
}
-#ifdef WITH_ADVANCED_LAYERS
struct SpaceLayers *CTX_wm_space_layers(const bContext *C)
{
ScrArea *sa = CTX_wm_area(C);
@@ -821,7 +820,6 @@ struct SpaceLayers *CTX_wm_space_layers(const bContext *C)
return sa->spacedata.first;
return NULL;
}
-#endif
void CTX_wm_manager_set(bContext *C, wmWindowManager *wm)
{
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 0fc3d30..51c4535 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -439,10 +439,8 @@ void BKE_scene_free(Scene *sce)
MEM_SAFE_FREE(sce->stats);
MEM_SAFE_FREE(sce->fps_info);
-#ifdef WITH_ADVANCED_LAYERS
BLI_assert(sce->object_layers != NULL);
BKE_layertree_delete(sce->object_layers);
-#endif
BKE_sound_destroy_scene(sce);
@@ -730,9 +728,7 @@ void BKE_scene_init(Scene *sce)
sce->gm.exitkey = 218; // Blender key code for ESC
-#ifdef WITH_ADVANCED_LAYERS
sce->object_layers = BKE_layertree_new(LAYER_TREETYPE_OBJECT);
-#endif
BKE_sound_create_scene(sce);
@@ -1146,10 +1142,8 @@ Base *BKE_scene_base_add(Scene *sce, Object *ob)
Base *b = MEM_callocN(sizeof(*b), __func__);
BLI_addhead(&sce->base, b);
-#ifdef WITH_ADVANCED_LAYERS
BLI_assert(sce->object_layers->active_layer != NULL); /* XXX quite easy to break currently */
BKE_objectlayer_base_assign(b, sce->object_layers->active_layer, false);
-#endif
b->object = ob;
b->flag = ob->flag;
@@ -1166,10 +1160,8 @@ void BKE_scene_base_unlink(Scene *sce, Base *base)
/* remove rigid body object from world before removing object */
if (base->object->rigidbody_object)
BKE_rigidbody_remove_object(sce, base->object);
-#ifdef WITH_ADVANCED_LAYERS
if (base->layer)
BKE_objectlayer_base_unassign(base);
-#endif
BLI_remlink(&sce->base, base);
if (sce->basact == base)
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index ca9618f..479d3a1 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -77,10 +77,6 @@ if(WITH_CODEC_FFMPEG)
add_definitions(-DWITH_FFMPEG)
endif()
-if(WITH_ADVANCED_LAYERS)
- add_definitions(-DWITH_ADVANCED_LAYERS)
-endif()
-
blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}")
# needed so writefile.c can use dna_type_offsets.h
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 3b6fa03..bb91d4d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5842,8 +5842,6 @@ static void direct_link_view_settings(FileData *fd, ColorManagedViewSettings *vi
direct_link_curvemapping(fd, view_settings->curve_mapping);
}
-#ifdef WITH_ADVANCED_LAYERS
-
/**
* \note Recursive.
*/
@@ -5884,8 +5882,6 @@ static void direct_link_layertree(FileData *fd, LayerTree *ltree)
direct_link_layeritems(fd, <ree->items, ltree, &counter);
}
-#endif
-
static void direct_link_scene(FileData *fd, Scene *sce)
{
Editing *ed;
@@ -6116,12 +6112,10 @@ static void direct_link_scene(FileData *fd, Scene *sce)
}
}
-#ifdef WITH_ADVANCED_LAYERS
sce->object_layers = newdataadr(fd, sce->object_layers);
if (sce->object_layers) {
direct_link_layertree(fd, sce->object_layers);
}
-#endif
sce->preview = direct_link_preview_image(fd, sce->preview);
@@ -6461,12 +6455,10 @@ static void lib_link_screen(FileData *fd, Main *main)
slogic->gpd = newlibadr_us(fd, sc->id.lib, slogic->gpd);
}
-#ifdef WITH_ADVANCED_LAYERS
else if (sl->spacetype == SPACE_LAYERS) {
SpaceLayers *slayer = (SpaceLayers *)sl;
slayer->flag |= SL_LAYERDATA_REFRESH;
}
-#endif
}
}
sc->id.tag &= ~LIB_TAG_NEED_LINK;
@@ -6852,12 +6844,10 @@ void blo_lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *cursc
slogic->gpd = restore_pointer_by_name(id_map, (ID *)slogic->gpd, USER_REAL);
}
-#ifdef WITH_ADVANCED_LAYERS
else if (sl->spacetype == SPACE_LAYERS) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list