[Bf-blender-cvs] [3dba4b9] soc-2016-layer_manager: Fix compiling without WITH_ADVANCED_LAYERS enabled
Julian Eisel
noreply at git.blender.org
Wed Jun 29 18:15:43 CEST 2016
Commit: 3dba4b94f7d9456a73666ad6ab6b2bd27fa059bb
Author: Julian Eisel
Date: Wed Jun 29 18:14:42 2016 +0200
Branches: soc-2016-layer_manager
https://developer.blender.org/rB3dba4b94f7d9456a73666ad6ab6b2bd27fa059bb
Fix compiling without WITH_ADVANCED_LAYERS enabled
===================================================================
M source/blender/blenkernel/intern/blender.c
M source/blender/editors/scene/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
===================================================================
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 8d764e9..2699705 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -82,7 +82,9 @@ 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/editors/scene/CMakeLists.txt b/source/blender/editors/scene/CMakeLists.txt
index 875a7c7..a324c27 100644
--- a/source/blender/editors/scene/CMakeLists.txt
+++ b/source/blender/editors/scene/CMakeLists.txt
@@ -39,6 +39,7 @@ if(WITH_ADVANCED_LAYERS)
list(APPEND SRC
layer_types.c
)
-endif()
-blender_add_lib(bf_editor_scene "${SRC}" "${INC}" "${INC_SYS}")
+ # Currently only needed for WITH_ADVANCED_LAYERS
+ blender_add_lib(bf_editor_scene "${SRC}" "${INC}" "${INC_SYS}")
+endif()
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 3e1d03d..25c109e 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -7582,6 +7582,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
ED_view3d_project_base(ar, base);
if (is_wire_color) {
+#ifdef WITH_ADVANCED_LAYERS
ThemeWireColor *wcol = view3d_layer_color_from_base(scene->object_layers, base);
if (wcol) {
if (base->flag & SELECT) {
@@ -7592,6 +7593,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
}
use_wire_color = true;
}
+#endif
}
/* fallback to theme setting */
if (!use_wire_color) {
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index e27b784..67c9fce 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -123,6 +123,7 @@ extern void bl_debug_draw_edge_add(const float v0[3], const float v1[3]);
extern void bl_debug_color_set(const unsigned int col);
#endif
+#ifdef WITH_ADVANCED_LAYERS
ThemeWireColor *view3d_layer_color_from_base(LayerTree *ltree, const Base *base)
{
bTheme *btheme = UI_GetTheme();
@@ -131,6 +132,7 @@ ThemeWireColor *view3d_layer_color_from_base(LayerTree *ltree, const Base *base)
return (col_idx > 0) ? &btheme->tarm[col_idx - 1] : NULL;
}
+#endif
void circf(float x, float y, float rad)
{
@@ -2230,6 +2232,7 @@ static void draw_dupli_objects(Scene *scene, ARegion *ar, View3D *v3d, Base *bas
int color;
if (is_wire_color) {
+#ifdef WITH_ADVANCED_LAYERS
ThemeWireColor *wcol = view3d_layer_color_from_base(scene->object_layers, base);
if (wcol) {
glColor3ubv((unsigned char *)(base->flag & SELECT ? wcol->select : wcol->solid));
@@ -2238,6 +2241,7 @@ static void draw_dupli_objects(Scene *scene, ARegion *ar, View3D *v3d, Base *bas
dflag = DRAW_CONSTCOLOR;
use_wire_color = true;
}
+#endif
}
/* fallback to theme setting */
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index 88bddf1..c970483 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -192,7 +192,9 @@ void ED_view3d_draw_depth(Scene *scene, struct ARegion *ar, View3D *v3d, bool al
void ED_view3d_draw_depth_gpencil(Scene *scene, ARegion *ar, View3D *v3d);
void ED_view3d_after_add(ListBase *lb, Base *base, const short dflag);
+#ifdef WITH_ADVANCED_LAYERS
struct ThemeWireColor *view3d_layer_color_from_base(struct LayerTree *ltree, const Base *base);
+#endif
void circf(float x, float y, float rad);
void circ(float x, float y, float rad);
void view3d_update_depths_rect(struct ARegion *ar, struct ViewDepths *d, struct rcti *rect);
More information about the Bf-blender-cvs
mailing list