diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-14 09:00:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-14 09:08:34 +0300 |
| commit | b5eeec715efd7124610316b3ebf0791eb2fd6fef (patch) | |
| tree | 31fe4498f8a86af94a5216c9d772424c12827ba0 /source/blender/editors | |
| parent | 289f9f42ff049a672b5235230435c16bc361b04e (diff) | |
Cleanup: remove BLI_blenlib from ghash header
This causes source files to depend on ghash header
for BLI_string/rect/listbase.
Also quiet warnings.
Diffstat (limited to 'source/blender/editors')
4 files changed, 13 insertions, 8 deletions
diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c index e68919aefaa..0ff77701eec 100644 --- a/source/blender/editors/scene/scene_edit.c +++ b/source/blender/editors/scene/scene_edit.c @@ -24,6 +24,9 @@ #include <stdio.h> +#include "BLI_compiler_attrs.h" +#include "BLI_listbase.h" + #include "BKE_context.h" #include "BKE_global.h" #include "BKE_layer.h" @@ -37,9 +40,6 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "BLI_compiler_attrs.h" -#include "BLI_listbase.h" - #include "BLT_translation.h" #include "DNA_workspace_types.h" diff --git a/source/blender/editors/space_node/node_manipulators.c b/source/blender/editors/space_node/node_manipulators.c index 8e736e47963..73b0f44b043 100644 --- a/source/blender/editors/space_node/node_manipulators.c +++ b/source/blender/editors/space_node/node_manipulators.c @@ -24,11 +24,13 @@ #include <math.h> -#include "BKE_context.h" -#include "BKE_image.h" - +#include "BLI_utildefines.h" #include "BLI_math_matrix.h" #include "BLI_math_vector.h" +#include "BLI_rect.h" + +#include "BKE_context.h" +#include "BKE_image.h" #include "ED_screen.h" #include "ED_manipulator_library.h" diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index 45d632dc293..2f03935c999 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -24,6 +24,9 @@ * \ingroup spoutliner */ +#include "BLI_utildefines.h" +#include "BLI_listbase.h" + #include "BKE_context.h" #include "BKE_collection.h" #include "BKE_layer.h" @@ -33,8 +36,6 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "BLI_listbase.h" - #include "ED_screen.h" #include "WM_api.h" diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 8a2c2594790..79fded30782 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -446,6 +446,7 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar TreeStoreElem *tselem; Object *ob = NULL; +#if 0 PropertyRNA *object_prop_hide, *object_prop_hide_select, *object_prop_hide_render; /* get RNA properties (once) */ @@ -453,6 +454,7 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar object_prop_hide_select = RNA_struct_type_find_property(&RNA_Object, "hide_select"); object_prop_hide_render = RNA_struct_type_find_property(&RNA_Object, "hide_render"); BLI_assert(object_prop_hide && object_prop_hide_select && object_prop_hide_render); +#endif for (te = lb->first; te; te = te->next) { |