Cleanup: Move editors headers to C++
See #103343 Pull Request: https://projects.blender.org/blender/blender/pulls/110820
This commit is contained in:
Hans Goudey
@@ -1114,8 +1114,8 @@ function(data_to_c_simple_icons
|
||||
${_icon_files}
|
||||
datatoc_icon
|
||||
datatoc
|
||||
# could be an arg but for now we only create icons depending on UI_icons.h
|
||||
${CMAKE_SOURCE_DIR}/source/blender/editors/include/UI_icons.h
|
||||
# could be an arg but for now we only create icons depending on UI_icons.hh
|
||||
${CMAKE_SOURCE_DIR}/source/blender/editors/include/UI_icons.hh
|
||||
)
|
||||
|
||||
set_source_files_properties(${_file_from} ${_file_to} PROPERTIES GENERATED TRUE)
|
||||
|
||||
@@ -174,7 +174,7 @@ def unregister():
|
||||
unregister_class(cls)
|
||||
|
||||
# Define a default UIList, when a list does not need any custom drawing...
|
||||
# Keep in sync with its #defined name in UI_interface.h
|
||||
# Keep in sync with its #defined name in UI_interface.hh
|
||||
|
||||
|
||||
class UI_UL_list(bpy.types.UIList):
|
||||
|
||||
@@ -3565,6 +3565,7 @@ class VIEW3D_MT_mask(Menu):
|
||||
|
||||
layout.template_node_operator_asset_menu_items(catalog_path=self.bl_label)
|
||||
|
||||
|
||||
class VIEW3D_MT_face_sets(Menu):
|
||||
bl_label = "Face Sets"
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ from bpy.types import KeyingSetInfo
|
||||
|
||||
|
||||
# "Defines"
|
||||
# Keep these in sync with those in ED_keyframing.h!
|
||||
# Keep these in sync with those in ED_keyframing.hh!
|
||||
ANIM_KS_LOCATION_ID = "Location"
|
||||
ANIM_KS_ROTATION_ID = "Rotation"
|
||||
ANIM_KS_SCALING_ID = "Scaling"
|
||||
|
||||
@@ -1508,7 +1508,7 @@ AssetHandle CTX_wm_asset_handle(const bContext *C, bool *r_is_valid)
|
||||
|
||||
/* If the asset handle was not found in context directly, try if there's an active file with
|
||||
* asset data there instead. Not nice to have this here, would be better to have this in
|
||||
* `ED_asset.h`, but we can't include that in BKE. Even better would be not needing this at all
|
||||
* `ED_asset.hh`, but we can't include that in BKE. Even better would be not needing this at all
|
||||
* and being able to have editors return this in the usual `context` callback. But that would
|
||||
* require returning a non-owning pointer, which we don't have in the Asset Browser (yet). */
|
||||
FileDirEntry *file =
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include "BKE_fcurve.h"
|
||||
|
||||
#include "ED_keyframing.h"
|
||||
#include "ED_keyframing.hh"
|
||||
|
||||
#include "DNA_anim_types.h"
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
#include "IMB_imbuf.h"
|
||||
|
||||
#include "ED_node.h"
|
||||
#include "ED_node.hh"
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
/** \file
|
||||
* \ingroup bke
|
||||
*
|
||||
* Used by ED_undo.h, internal implementation.
|
||||
* Used by ED_undo.hh, internal implementation.
|
||||
*/
|
||||
|
||||
#include <cstdio>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "BLI_string_utf8_symbols.h"
|
||||
#include "BLI_timeit.hh"
|
||||
|
||||
/* Right arrow, keep in sync with #UI_MENU_ARROW_SEP in `UI_interface.h`. */
|
||||
/* Right arrow, keep in sync with #UI_MENU_ARROW_SEP in `UI_interface.hh`. */
|
||||
#define UI_MENU_ARROW_SEP BLI_STR_UTF8_BLACK_RIGHT_POINTING_SMALL_TRIANGLE
|
||||
#define UI_MENU_ARROW_SEP_UNICODE 0x25b8
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
namespace blender::string_search::tests {
|
||||
|
||||
/* Right arrow, keep in sync with #UI_MENU_ARROW_SEP in `UI_interface.h`. */
|
||||
/* Right arrow, keep in sync with #UI_MENU_ARROW_SEP in `UI_interface.hh`. */
|
||||
#define UI_MENU_ARROW_SEP "\xe2\x96\xb8"
|
||||
|
||||
TEST(string_search, damerau_levenshtein_distance)
|
||||
|
||||
@@ -117,7 +117,7 @@ def dice_icon_name(
|
||||
# Search for eg: DEF_ICON(BRUSH_NUDGE) --> BRUSH_NUDGE
|
||||
re_icon = re.compile(r'^\s*DEF_ICON.*\(\s*([A-Za-z0-9_]+)\s*\).*$')
|
||||
|
||||
ui_icons_h = os.path.join(SOURCE_DIR, "source", "blender", "editors", "include", "UI_icons.h")
|
||||
ui_icons_h = os.path.join(SOURCE_DIR, "source", "blender", "editors", "include", "UI_icons.hh")
|
||||
with open(ui_icons_h, 'r', encoding="utf-8") as f:
|
||||
for l in f:
|
||||
match = re_icon.search(l)
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "DRW_render.h"
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#include "GPU_material.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "eevee_lightcache.h"
|
||||
#include "eevee_private.h"
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
#include "BKE_camera.h"
|
||||
#include "DEG_depsgraph_query.h"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
#include "RE_pipeline.h"
|
||||
#include "render_types.h"
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "GPU_capabilities.h"
|
||||
#include "GPU_framebuffer.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "DRW_render.h"
|
||||
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
#include "BKE_object.h"
|
||||
#include "BKE_particle.h"
|
||||
|
||||
#include "ED_image.h"
|
||||
#include "ED_image.hh"
|
||||
#include "ED_screen.hh"
|
||||
|
||||
#include "GPU_batch.h"
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
#include "DRW_engine.h"
|
||||
#include "DRW_render.h"
|
||||
|
||||
#include "ED_gpencil_legacy.h"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_gpencil_legacy.hh"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "DNA_gpencil_legacy_types.h"
|
||||
#include "DNA_view3d_types.h"
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "DRW_engine.h"
|
||||
#include "DRW_render.h"
|
||||
#include "ED_screen.hh"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
#include "GPU_capabilities.h"
|
||||
#include "IMB_imbuf_types.h"
|
||||
|
||||
|
||||
@@ -36,9 +36,9 @@
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
#include "ED_screen.hh"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
/* *********** FUNCTIONS *********** */
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include "IMB_imbuf.h"
|
||||
#include "IMB_imbuf_types.h"
|
||||
|
||||
#include "ED_image.h"
|
||||
#include "ED_image.hh"
|
||||
|
||||
#include "GPU_batch.h"
|
||||
|
||||
|
||||
@@ -32,12 +32,12 @@
|
||||
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
#include "ED_armature.h"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_armature.hh"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "ANIM_bone_collections.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "draw_common.h"
|
||||
#include "draw_manager_text.h"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "DRW_render.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "draw_manager_text.h"
|
||||
#include "overlay_private.hh"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "DRW_render.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "DRW_render.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "DNA_mesh_types.h"
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "DRW_render.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "BKE_vfont.h"
|
||||
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
#include "ED_image.h"
|
||||
#include "ED_image.hh"
|
||||
|
||||
#include "IMB_imbuf_types.h"
|
||||
|
||||
#include "GPU_batch.h"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_interface.hh"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "overlay_private.hh"
|
||||
|
||||
|
||||
@@ -13,9 +13,9 @@
|
||||
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_interface.hh"
|
||||
|
||||
#include "BKE_duplilist.h"
|
||||
#include "BKE_object.h"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "DRW_render.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "BKE_anim_path.h"
|
||||
#include "BKE_camera.h"
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "overlay_private.hh"
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "BKE_paint.hh"
|
||||
#include "DRW_render.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "overlay_private.hh"
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
#include "BKE_gpencil_legacy.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "DNA_gpencil_legacy_types.h"
|
||||
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "overlay_private.hh"
|
||||
|
||||
|
||||
@@ -13,10 +13,10 @@
|
||||
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
#include "ED_image.h"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_image.hh"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "overlay_next_instance.hh"
|
||||
#include "overlay_private.hh"
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "IMB_imbuf_types.h"
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
#include "ED_mball.h"
|
||||
#include "ED_mball.hh"
|
||||
|
||||
#include "overlay_private.hh"
|
||||
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
#include "BKE_paint.hh"
|
||||
#include "DRW_render.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "PIL_time.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "overlay_private.hh"
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
#include "GPU_batch.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "draw_manager_text.h"
|
||||
|
||||
|
||||
@@ -13,9 +13,9 @@
|
||||
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_interface.hh"
|
||||
|
||||
#include "BKE_duplilist.h"
|
||||
#include "BKE_object.h"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "DEG_depsgraph_query.h"
|
||||
#include "DNA_camera_types.h"
|
||||
#include "DNA_space_types.h"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "overlay_next_private.hh"
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "DEG_depsgraph_query.h"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
#include "draw_debug.hh"
|
||||
|
||||
#include "overlay_next_instance.hh"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "overlay_next_private.hh"
|
||||
#include "overlay_shader_shared.h"
|
||||
|
||||
#include "ED_mball.h"
|
||||
#include "ED_mball.hh"
|
||||
|
||||
namespace blender::draw::overlay {
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "DRW_gpu_wrapper.hh"
|
||||
#include "DRW_render.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
#include "draw_manager.hh"
|
||||
#include "draw_pass.hh"
|
||||
#include "gpu_shader_create_info.hh"
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
#include "DNA_gpencil_legacy_types.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "overlay_private.hh"
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include "BKE_pointcache.h"
|
||||
|
||||
#include "ED_particle.h"
|
||||
#include "ED_particle.hh"
|
||||
|
||||
#include "overlay_private.hh"
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "DRW_gpu_wrapper.hh"
|
||||
#include "DRW_render.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "draw_handle.hh"
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "GPU_shader.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "gpu_shader_create_info.hh"
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "DRW_render.h"
|
||||
#include "GPU_shader.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "overlay_private.hh"
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include "DNA_mesh_types.h"
|
||||
#include "DNA_scene_types.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "DEG_depsgraph.h"
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
|
||||
#include "DNA_screen_types.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "DRW_engine.h"
|
||||
#include "DRW_select_buffer.h"
|
||||
|
||||
@@ -14,9 +14,9 @@
|
||||
#include "DNA_userdef_types.h"
|
||||
|
||||
#include "ED_screen.hh"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "GPU_uniform_buffer.h"
|
||||
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
#include "BKE_report.h"
|
||||
#include "DEG_depsgraph_query.h"
|
||||
#include "DNA_fluid_types.h"
|
||||
#include "ED_paint.h"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_paint.hh"
|
||||
#include "ED_view3d.hh"
|
||||
#include "GPU_capabilities.h"
|
||||
#include "IMB_imbuf_types.h"
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "DNA_node_types.h"
|
||||
#include "DNA_pointcloud_types.h"
|
||||
|
||||
#include "ED_paint.h"
|
||||
#include "ED_paint.hh"
|
||||
|
||||
#include "GPU_context.h"
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "GPU_uniform_buffer.h"
|
||||
|
||||
#include "ED_uvedit.h"
|
||||
#include "ED_uvedit.hh"
|
||||
|
||||
#define HSV_SATURATION 0.5
|
||||
#define HSV_VALUE 0.8
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
/* get_image */
|
||||
#include "BKE_node.hh"
|
||||
#include "DNA_node_types.h"
|
||||
#include "ED_uvedit.h"
|
||||
#include "ED_uvedit.hh"
|
||||
/* get_image */
|
||||
|
||||
namespace blender::workbench {
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
#include "DRW_render.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "GPU_context.h"
|
||||
#include "GPU_shader.h"
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
#include "BKE_pbvh_api.hh"
|
||||
#include "DEG_depsgraph_query.h"
|
||||
#include "DNA_fluid_types.h"
|
||||
#include "ED_paint.h"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_paint.hh"
|
||||
#include "ED_view3d.hh"
|
||||
#include "GPU_capabilities.h"
|
||||
|
||||
namespace blender::workbench {
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#include "DRW_render.h"
|
||||
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "workbench_engine.h"
|
||||
#include "workbench_private.h"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "DNA_scene_types.h"
|
||||
#include "DNA_volume_types.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#include "GPU_batch.h"
|
||||
|
||||
#include "ED_mesh.h"
|
||||
#include "ED_mesh.hh"
|
||||
|
||||
#include "mesh_extractors/extract_mesh.hh"
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "GPU_material.h"
|
||||
#include "GPU_texture.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "DRW_render.h"
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "DRW_engine.h"
|
||||
#include "DRW_render.h"
|
||||
|
||||
#include "ED_gpencil_legacy.h"
|
||||
#include "ED_gpencil_legacy.hh"
|
||||
#include "GPU_batch.h"
|
||||
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
@@ -55,8 +55,8 @@
|
||||
|
||||
#include "DRW_render.h"
|
||||
|
||||
#include "ED_mesh.h"
|
||||
#include "ED_uvedit.h"
|
||||
#include "ED_mesh.hh"
|
||||
#include "ED_uvedit.hh"
|
||||
|
||||
#include "draw_cache_extract.hh"
|
||||
#include "draw_cache_inline.h"
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "BKE_particle.h"
|
||||
#include "BKE_pointcache.h"
|
||||
|
||||
#include "ED_particle.h"
|
||||
#include "ED_particle.hh"
|
||||
|
||||
#include "GPU_batch.h"
|
||||
#include "GPU_capabilities.h"
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
#include "DRW_render.h"
|
||||
|
||||
#include "draw_cache.h" /* own include */
|
||||
#include "draw_cache.h" /* own include */
|
||||
#include "draw_cache_impl.hh" /* own include */
|
||||
|
||||
static void volume_batch_cache_clear(Volume *volume);
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "GPU_shader.h"
|
||||
#include "GPU_texture.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "BKE_colorband.h"
|
||||
#include "BKE_global.h"
|
||||
|
||||
@@ -49,10 +49,10 @@
|
||||
#include "DNA_view3d_types.h"
|
||||
#include "DNA_world_types.h"
|
||||
|
||||
#include "ED_gpencil_legacy.h"
|
||||
#include "ED_gpencil_legacy.hh"
|
||||
#include "ED_screen.hh"
|
||||
#include "ED_space_api.h"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_space_api.hh"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "GPU_capabilities.h"
|
||||
#include "GPU_framebuffer.h"
|
||||
@@ -69,8 +69,8 @@
|
||||
#include "RE_engine.h"
|
||||
#include "RE_pipeline.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_view2d.h"
|
||||
#include "UI_resources.hh"
|
||||
#include "UI_view2d.hh"
|
||||
|
||||
#include "WM_api.hh"
|
||||
#include "wm_window.hh"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "GPU_debug.h"
|
||||
#include "GPU_texture.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "draw_manager_profiling.hh"
|
||||
|
||||
|
||||
@@ -31,10 +31,10 @@
|
||||
#include "GPU_state.h"
|
||||
|
||||
#include "ED_screen.hh"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_interface.hh"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "BLF_api.h"
|
||||
#include "WM_api.hh"
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
#include "ED_screen.hh"
|
||||
#include "ED_util.hh"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "GPU_immediate.h"
|
||||
#include "GPU_matrix.h"
|
||||
#include "GPU_shader.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
#include "UI_view2d.h"
|
||||
#include "UI_resources.hh"
|
||||
#include "UI_view2d.hh"
|
||||
|
||||
#include "WM_types.hh"
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "DNA_object_types.h"
|
||||
|
||||
#include "ED_uvedit.h"
|
||||
#include "ED_uvedit.hh"
|
||||
|
||||
#include "extract_mesh.hh"
|
||||
|
||||
|
||||
@@ -63,13 +63,13 @@
|
||||
|
||||
#include "DEG_depsgraph.h"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_interface_icons.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_view2d.h"
|
||||
#include "UI_interface.hh"
|
||||
#include "UI_interface_icons.hh"
|
||||
#include "UI_resources.hh"
|
||||
#include "UI_view2d.hh"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_keyframing.h"
|
||||
#include "ED_anim_api.hh"
|
||||
#include "ED_keyframing.hh"
|
||||
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
@@ -4136,7 +4136,7 @@ static void ANIM_init_channel_typeinfo_data()
|
||||
ACF_INIT = 0;
|
||||
|
||||
/* NOTE: need to keep the order of these synchronized with the definition of
|
||||
* channel types (eAnim_ChannelType) in ED_anim_api.h
|
||||
* channel types (eAnim_ChannelType) in ED_anim_api.hh
|
||||
*/
|
||||
animchannelTypeInfo[type++] = nullptr; /* None */
|
||||
animchannelTypeInfo[type++] = nullptr; /* AnimData */
|
||||
|
||||
@@ -43,16 +43,16 @@
|
||||
#include "DEG_depsgraph.h"
|
||||
#include "DEG_depsgraph_build.h"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_view2d.h"
|
||||
#include "UI_interface.hh"
|
||||
#include "UI_view2d.hh"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_armature.h"
|
||||
#include "ED_keyframes_edit.h" /* XXX move the select modes out of there! */
|
||||
#include "ED_markers.h"
|
||||
#include "ED_object.h"
|
||||
#include "ED_anim_api.hh"
|
||||
#include "ED_armature.hh"
|
||||
#include "ED_keyframes_edit.hh" /* XXX move the select modes out of there! */
|
||||
#include "ED_markers.hh"
|
||||
#include "ED_object.hh"
|
||||
#include "ED_screen.hh"
|
||||
#include "ED_select_utils.h"
|
||||
#include "ED_select_utils.hh"
|
||||
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
#include "SEQ_sequencer.h"
|
||||
#include "SEQ_utils.h"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_anim_api.hh"
|
||||
|
||||
/* **************************** depsgraph tagging ******************************** */
|
||||
|
||||
|
||||
@@ -30,17 +30,17 @@
|
||||
#include "BKE_mask.h"
|
||||
#include "BKE_nla.h"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_keyframes_draw.h"
|
||||
#include "ED_keyframes_edit.h"
|
||||
#include "ED_keyframes_keylist.h"
|
||||
#include "ED_anim_api.hh"
|
||||
#include "ED_keyframes_draw.hh"
|
||||
#include "ED_keyframes_edit.hh"
|
||||
#include "ED_keyframes_keylist.hh"
|
||||
|
||||
#include "RNA_access.h"
|
||||
#include "RNA_path.h"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_view2d.h"
|
||||
#include "UI_interface.hh"
|
||||
#include "UI_resources.hh"
|
||||
#include "UI_view2d.hh"
|
||||
|
||||
#include "GPU_immediate.h"
|
||||
#include "GPU_matrix.h"
|
||||
|
||||
@@ -83,15 +83,15 @@
|
||||
#include "BKE_modifier.h"
|
||||
#include "BKE_node.h"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_markers.h"
|
||||
#include "ED_anim_api.hh"
|
||||
#include "ED_markers.hh"
|
||||
|
||||
#include "SEQ_sequencer.h"
|
||||
#include "SEQ_utils.h"
|
||||
|
||||
#include "ANIM_bone_collections.h"
|
||||
|
||||
#include "UI_resources.h" /* for TH_KEYFRAME_SCALE lookup */
|
||||
#include "UI_resources.hh" /* for TH_KEYFRAME_SCALE lookup */
|
||||
|
||||
/* ************************************************************ */
|
||||
/* Blender Context <-> Animation Context mapping */
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "RNA_path.h"
|
||||
#include "RNA_prototypes.h"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_anim_api.hh"
|
||||
|
||||
/* ----------------------- Getter functions ----------------------- */
|
||||
|
||||
|
||||
@@ -40,19 +40,19 @@
|
||||
#include "GPU_matrix.h"
|
||||
#include "GPU_state.h"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_interface_icons.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_view2d.h"
|
||||
#include "UI_interface.hh"
|
||||
#include "UI_interface_icons.hh"
|
||||
#include "UI_resources.hh"
|
||||
#include "UI_view2d.hh"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_keyframes_edit.h"
|
||||
#include "ED_markers.h"
|
||||
#include "ED_numinput.h"
|
||||
#include "ED_object.h"
|
||||
#include "ED_anim_api.hh"
|
||||
#include "ED_keyframes_edit.hh"
|
||||
#include "ED_markers.hh"
|
||||
#include "ED_numinput.hh"
|
||||
#include "ED_object.hh"
|
||||
#include "ED_screen.hh"
|
||||
#include "ED_select_utils.h"
|
||||
#include "ED_transform.h"
|
||||
#include "ED_select_utils.hh"
|
||||
#include "ED_transform.hh"
|
||||
#include "ED_util.hh"
|
||||
|
||||
#include "DEG_depsgraph.h"
|
||||
|
||||
@@ -30,8 +30,8 @@
|
||||
#include "GPU_batch.h"
|
||||
#include "GPU_vertex_buffer.h"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_keyframes_keylist.h"
|
||||
#include "ED_anim_api.hh"
|
||||
#include "ED_keyframes_keylist.hh"
|
||||
|
||||
#include "ANIM_bone_collections.h"
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "BKE_report.h"
|
||||
#include "BKE_scene.h"
|
||||
|
||||
#include "UI_view2d.h"
|
||||
#include "UI_view2d.hh"
|
||||
|
||||
#include "RNA_access.h"
|
||||
#include "RNA_define.h"
|
||||
@@ -29,10 +29,10 @@
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_anim_api.hh"
|
||||
#include "ED_screen.hh"
|
||||
#include "ED_sequencer.h"
|
||||
#include "ED_time_scrub_ui.h"
|
||||
#include "ED_sequencer.hh"
|
||||
#include "ED_time_scrub_ui.hh"
|
||||
|
||||
#include "DEG_depsgraph.h"
|
||||
|
||||
|
||||
@@ -30,10 +30,10 @@
|
||||
#include "DEG_depsgraph.h"
|
||||
#include "DEG_depsgraph_build.h"
|
||||
|
||||
#include "ED_keyframing.h"
|
||||
#include "ED_keyframing.hh"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_interface.hh"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
|
||||
@@ -36,11 +36,11 @@
|
||||
#include "RNA_access.h"
|
||||
#include "RNA_prototypes.h"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_interface.hh"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_undo.h"
|
||||
#include "ED_anim_api.hh"
|
||||
#include "ED_undo.hh"
|
||||
|
||||
#include "DEG_depsgraph.h"
|
||||
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
#include "GPU_shader_shared.h"
|
||||
#include "GPU_state.h"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_view2d.h"
|
||||
#include "UI_interface.hh"
|
||||
#include "UI_resources.hh"
|
||||
#include "UI_view2d.hh"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_keyframes_draw.h"
|
||||
#include "ED_keyframes_keylist.h"
|
||||
#include "ED_anim_api.hh"
|
||||
#include "ED_keyframes_draw.hh"
|
||||
#include "ED_keyframes_keylist.hh"
|
||||
|
||||
/* *************************** Keyframe Drawing *************************** */
|
||||
|
||||
|
||||
@@ -25,9 +25,9 @@
|
||||
#include "BKE_fcurve.h"
|
||||
#include "BKE_nla.h"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_keyframes_edit.h"
|
||||
#include "ED_markers.h"
|
||||
#include "ED_anim_api.hh"
|
||||
#include "ED_keyframes_edit.hh"
|
||||
#include "ED_markers.hh"
|
||||
|
||||
/* This file defines an API and set of callback-operators for
|
||||
* non-destructive editing of keyframe data.
|
||||
|
||||
@@ -34,9 +34,9 @@
|
||||
#include "RNA_enum_types.h"
|
||||
#include "RNA_path.h"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_keyframes_edit.h"
|
||||
#include "ED_keyframing.h"
|
||||
#include "ED_anim_api.hh"
|
||||
#include "ED_keyframes_edit.hh"
|
||||
#include "ED_keyframing.hh"
|
||||
|
||||
/* This file contains code for various keyframe-editing tools which are 'destructive'
|
||||
* (i.e. they will modify the order of the keyframes, and change the size of the array).
|
||||
|
||||
@@ -35,10 +35,9 @@
|
||||
#include "BKE_fcurve.h"
|
||||
#include "BKE_grease_pencil.hh"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_keyframes_keylist.h"
|
||||
#include "ED_anim_api.hh"
|
||||
#include "ED_keyframes_keylist.hh"
|
||||
|
||||
extern "C" {
|
||||
/* *************************** Keyframe Processing *************************** */
|
||||
|
||||
/* ActKeyColumns (Keyframe Columns) ------------------------------------------ */
|
||||
@@ -1202,4 +1201,3 @@ void mask_to_keylist(bDopeSheet * /*ads*/, MaskLayer *masklay, AnimKeylist *keyl
|
||||
update_keyblocks(keylist, nullptr, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "ED_keyframes_keylist.h"
|
||||
#include "ED_keyframes_keylist.hh"
|
||||
|
||||
#include "DNA_anim_types.h"
|
||||
#include "DNA_curve_types.h"
|
||||
|
||||
@@ -51,16 +51,16 @@
|
||||
#include "DEG_depsgraph_build.h"
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_keyframes_edit.h"
|
||||
#include "ED_keyframing.h"
|
||||
#include "ED_object.h"
|
||||
#include "ED_anim_api.hh"
|
||||
#include "ED_keyframes_edit.hh"
|
||||
#include "ED_keyframing.hh"
|
||||
#include "ED_object.hh"
|
||||
#include "ED_screen.hh"
|
||||
|
||||
#include "ANIM_bone_collections.h"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_interface.hh"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
|
||||
@@ -28,11 +28,11 @@
|
||||
|
||||
#include "DEG_depsgraph.h"
|
||||
|
||||
#include "ED_keyframing.h"
|
||||
#include "ED_keyframing.hh"
|
||||
#include "ED_screen.hh"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_interface.hh"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
|
||||
@@ -13,15 +13,15 @@
|
||||
#include "GPU_matrix.h"
|
||||
#include "GPU_state.h"
|
||||
|
||||
#include "ED_time_scrub_ui.h"
|
||||
#include "ED_time_scrub_ui.hh"
|
||||
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_interface_icons.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_view2d.h"
|
||||
#include "UI_interface.hh"
|
||||
#include "UI_interface_icons.hh"
|
||||
#include "UI_resources.hh"
|
||||
#include "UI_view2d.hh"
|
||||
|
||||
#include "DNA_scene_types.h"
|
||||
|
||||
|
||||
@@ -38,10 +38,10 @@
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
|
||||
#include "ED_armature.h"
|
||||
#include "ED_outliner.h"
|
||||
#include "ED_armature.hh"
|
||||
#include "ED_outliner.hh"
|
||||
#include "ED_screen.hh"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "ANIM_bone_collections.h"
|
||||
|
||||
|
||||
@@ -36,10 +36,10 @@
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
|
||||
#include "ED_armature.h"
|
||||
#include "ED_outliner.h"
|
||||
#include "ED_armature.hh"
|
||||
#include "ED_outliner.hh"
|
||||
#include "ED_screen.hh"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "ANIM_bone_collections.h"
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
|
||||
#include "ED_armature.h"
|
||||
#include "ED_armature.hh"
|
||||
#include "ED_screen.hh"
|
||||
|
||||
#include "armature_intern.h"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
|
||||
#include "ED_armature.h"
|
||||
#include "ED_armature.hh"
|
||||
#include "ED_screen.hh"
|
||||
|
||||
#include "armature_intern.h"
|
||||
|
||||
@@ -41,13 +41,13 @@
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
|
||||
#include "ED_armature.h"
|
||||
#include "ED_object.h"
|
||||
#include "ED_outliner.h"
|
||||
#include "ED_armature.hh"
|
||||
#include "ED_object.hh"
|
||||
#include "ED_outliner.hh"
|
||||
#include "ED_screen.hh"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_interface.hh"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "armature_intern.h"
|
||||
|
||||
|
||||
@@ -31,12 +31,12 @@
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
|
||||
#include "ED_armature.h"
|
||||
#include "ED_object.h"
|
||||
#include "ED_outliner.h"
|
||||
#include "ED_armature.hh"
|
||||
#include "ED_object.hh"
|
||||
#include "ED_outliner.hh"
|
||||
#include "ED_screen.hh"
|
||||
#include "ED_select_utils.h"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_select_utils.hh"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "DEG_depsgraph.h"
|
||||
|
||||
|
||||
@@ -34,8 +34,8 @@
|
||||
#include "DEG_depsgraph.h"
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
#include "ED_armature.h"
|
||||
#include "ED_mesh.h"
|
||||
#include "ED_armature.hh"
|
||||
#include "ED_mesh.hh"
|
||||
|
||||
#include "ANIM_bone_collections.h"
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#include "DEG_depsgraph.h"
|
||||
|
||||
#include "ED_armature.h"
|
||||
#include "ED_armature.hh"
|
||||
#include "ED_util.hh"
|
||||
|
||||
#include "ANIM_bone_collections.h"
|
||||
|
||||
@@ -27,9 +27,9 @@
|
||||
|
||||
#include "DEG_depsgraph.h"
|
||||
|
||||
#include "ED_armature.h"
|
||||
#include "ED_object.h"
|
||||
#include "ED_undo.h"
|
||||
#include "ED_armature.hh"
|
||||
#include "ED_object.hh"
|
||||
#include "ED_undo.hh"
|
||||
#include "ED_util.hh"
|
||||
|
||||
#include "WM_api.hh"
|
||||
|
||||
@@ -27,8 +27,8 @@
|
||||
#include "BKE_mesh_wrapper.hh"
|
||||
#include "BKE_modifier.h"
|
||||
|
||||
#include "ED_armature.h"
|
||||
#include "ED_mesh.h"
|
||||
#include "ED_armature.hh"
|
||||
#include "ED_mesh.hh"
|
||||
|
||||
#include "DEG_depsgraph.h"
|
||||
|
||||
|
||||
@@ -63,4 +63,4 @@ void rigid_deform_end(int cancel);
|
||||
|
||||
/* Harmonic Coordinates */
|
||||
|
||||
/* ED_mesh_deform_bind_callback(...) defined in ED_armature.h */
|
||||
/* ED_mesh_deform_bind_callback(...) defined in ED_armature.hh */
|
||||
|
||||
@@ -43,16 +43,16 @@
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
|
||||
#include "ED_anim_api.h"
|
||||
#include "ED_armature.h"
|
||||
#include "ED_keyframing.h"
|
||||
#include "ED_object.h"
|
||||
#include "ED_anim_api.hh"
|
||||
#include "ED_armature.hh"
|
||||
#include "ED_keyframing.hh"
|
||||
#include "ED_object.hh"
|
||||
#include "ED_screen.hh"
|
||||
#include "ED_view3d.h"
|
||||
#include "ED_view3d.hh"
|
||||
|
||||
#include "ANIM_bone_collections.h"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_interface.hh"
|
||||
|
||||
#include "armature_intern.h"
|
||||
|
||||
|
||||
@@ -28,12 +28,12 @@
|
||||
#include "WM_api.hh"
|
||||
#include "WM_types.hh"
|
||||
|
||||
#include "ED_armature.h"
|
||||
#include "ED_outliner.h"
|
||||
#include "ED_armature.hh"
|
||||
#include "ED_outliner.hh"
|
||||
#include "ED_screen.hh"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "UI_resources.h"
|
||||
#include "UI_interface.hh"
|
||||
#include "UI_resources.hh"
|
||||
|
||||
#include "armature_intern.h"
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user