[Bf-blender-cvs] [ebce8d65d47] temp-lanpr-staging: LANPR: Header inclusion order fixes.
YimingWu
noreply at git.blender.org
Wed Sep 4 08:47:20 CEST 2019
Commit: ebce8d65d4706a4e42ae8f7485d56b2195b33faf
Author: YimingWu
Date: Wed Sep 4 14:46:44 2019 +0800
Branches: temp-lanpr-staging
https://developer.blender.org/rBebce8d65d4706a4e42ae8f7485d56b2195b33faf
LANPR: Header inclusion order fixes.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_all.h
M source/blender/draw/engines/lanpr/lanpr_chain_draw.c
M source/blender/draw/engines/lanpr/lanpr_cpu.c
M source/blender/draw/engines/lanpr/lanpr_dpix.c
M source/blender/draw/engines/lanpr/lanpr_engine.c
M source/blender/editors/include/ED_lanpr.h
M source/blender/editors/lanpr/lanpr_chain.c
M source/blender/editors/lanpr/lanpr_cpu.c
M source/blender/editors/lanpr/lanpr_util.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h b/source/blender/draw/engines/lanpr/lanpr_all.h
index 43792be1980..eb12f71a08d 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -24,37 +24,41 @@
#ifndef __LANPR_ALL_H__
#define __LANPR_ALL_H__
-#include "ED_lanpr.h"
#include "BLI_mempool.h"
+#include "BLI_threads.h"
#include "BLI_utildefines.h"
-/* #include "GPU_framebuffer.h" */
-#include "GPU_batch.h"
-#include "GPU_framebuffer.h"
-#include "GPU_shader.h"
-#include "GPU_uniformbuffer.h"
-#include "GPU_viewport.h"
-#include "DNA_listBase.h"
-#include "DRW_render.h"
+
+#include "BKE_customdata.h"
#include "BKE_object.h"
-#include "DNA_mesh_types.h"
+
+#include "DEG_depsgraph_query.h"
+
#include "DNA_camera_types.h"
-#include "GPU_immediate.h"
-#include "GPU_immediate_util.h"
-#include "GPU_framebuffer.h"
+#include "DNA_listBase.h"
#include "DNA_lanpr_types.h"
+#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
-#include "BKE_customdata.h"
-#include "DEG_depsgraph_query.h"
-#include "GPU_draw.h"
-#include "GPU_texture.h"
-#include "BLI_threads.h"
+#include "DRW_render.h"
-#include "bmesh.h"
+#include "ED_lanpr.h"
+
+#include "GPU_batch.h"
+#include "GPU_draw.h"
+#include "GPU_framebuffer.h"
+#include "GPU_framebuffer.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
+#include "GPU_shader.h"
+#include "GPU_texture.h"
+#include "GPU_uniformbuffer.h"
+#include "GPU_viewport.h"
#include "WM_types.h"
#include "WM_api.h"
+#include "bmesh.h"
+
#define LANPR_ENGINE "BLENDER_LANPR"
#define deg(r) r / M_PI * 180.0
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
index 08395d1ed5c..ec7fca1b797 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
@@ -21,31 +21,34 @@
* \ingroup draw
*/
+#include "BKE_customdata.h"
+#include "BKE_object.h"
-#include "DRW_engine.h"
-#include "DRW_render.h"
-#include "BLI_listbase.h"
#include "BLI_linklist.h"
+#include "BLI_listbase.h"
#include "BLI_math.h"
-#include "lanpr_all.h"
-#include "DRW_render.h"
-#include "BKE_object.h"
-#include "DNA_mesh_types.h"
+
+#include "DEG_depsgraph_query.h"
+
#include "DNA_camera_types.h"
-#include "GPU_immediate.h"
-#include "GPU_immediate_util.h"
-#include "GPU_framebuffer.h"
#include "DNA_lanpr_types.h"
+#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
-#include "BKE_customdata.h"
-#include "DEG_depsgraph_query.h"
-#include "GPU_draw.h"
+
+#include "DRW_engine.h"
+#include "DRW_render.h"
+
#include "GPU_batch.h"
+#include "GPU_draw.h"
#include "GPU_framebuffer.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
#include "GPU_shader.h"
#include "GPU_uniformbuffer.h"
#include "GPU_viewport.h"
+
+#include "lanpr_all.h"
#include "bmesh.h"
#include <math.h>
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index 93205625177..dd3a98c5d02 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -21,54 +21,60 @@
* \ingroup draw
*/
+#include "DNA_camera_types.h"
+#include "DNA_lanpr_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_modifier_types.h"
+#include "DNA_text_types.h"
+
#include "DRW_engine.h"
#include "DRW_render.h"
+
+#include "DEG_depsgraph_query.h"
+
+#include "ED_lanpr.h"
+
#include "BLI_listbase.h"
#include "BLI_linklist.h"
#include "BLI_math_matrix.h"
#include "BLI_task.h"
#include "BLI_utildefines.h"
-#include "lanpr_all.h"
-#include "ED_lanpr.h"
-#include "DRW_render.h"
-#include "BKE_object.h"
-#include "DNA_mesh_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_text_types.h"
-#include "GPU_immediate.h"
-#include "GPU_immediate_util.h"
-#include "GPU_framebuffer.h"
-#include "DNA_lanpr_types.h"
-#include "DNA_meshdata_types.h"
-#include "BKE_customdata.h"
-#include "DEG_depsgraph_query.h"
+
#include "BKE_camera.h"
+#include "BKE_customdata.h"
#include "BKE_collection.h"
+#include "BKE_gpencil.h"
+#include "BKE_gpencil_modifier.h"
+#include "BKE_modifier.h"
+#include "BKE_object.h"
#include "BKE_report.h"
#include "BKE_screen.h"
#include "BKE_text.h"
-#include "GPU_draw.h"
#include "GPU_batch.h"
+#include "GPU_draw.h"
+#include "GPU_framebuffer.h"
#include "GPU_framebuffer.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
#include "GPU_shader.h"
#include "GPU_uniformbuffer.h"
#include "GPU_viewport.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_types.h"
+#include "WM_api.h"
+
#include "bmesh.h"
#include "bmesh_class.h"
#include "bmesh_tools.h"
-#include "WM_types.h"
-#include "WM_api.h"
+#include "lanpr_all.h"
#include <math.h>
-#include "RNA_access.h"
-#include "RNA_define.h"
-
-#include "BKE_modifier.h"
-#include "BKE_gpencil.h"
-#include "BKE_gpencil_modifier.h"
extern LANPR_SharedResource lanpr_share;
extern const char *RE_engine_id_BLENDER_LANPR;
diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c b/source/blender/draw/engines/lanpr/lanpr_dpix.c
index 4dab888d9b8..6f7c8bfbc96 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -21,29 +21,34 @@
* \ingroup draw
*/
-#include "DRW_engine.h"
-#include "DRW_render.h"
-#include "BLI_listbase.h"
-#include "BLI_linklist.h"
-#include "lanpr_all.h"
-#include "DRW_render.h"
+#include "BKE_customdata.h"
#include "BKE_object.h"
-#include "DNA_mesh_types.h"
+
+#include "BLI_linklist.h"
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+
+#include "DEG_depsgraph_query.h"
+
#include "DNA_camera_types.h"
-#include "GPU_immediate.h"
-#include "GPU_immediate_util.h"
-#include "GPU_framebuffer.h"
#include "DNA_lanpr_types.h"
+#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
-#include "BKE_customdata.h"
-#include "DEG_depsgraph_query.h"
-#include "GPU_draw.h"
+
+#include "DRW_engine.h"
+#include "DRW_render.h"
+
#include "GPU_batch.h"
+#include "GPU_draw.h"
#include "GPU_framebuffer.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
#include "GPU_shader.h"
#include "GPU_uniformbuffer.h"
#include "GPU_viewport.h"
+
+#include "lanpr_all.h"
#include "bmesh.h"
#include <math.h>
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index f3035741214..87734e07c70 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -21,31 +21,37 @@
* \ingroup draw
*/
-#include "DRW_engine.h"
-#include "DRW_render.h"
+
+
#include "BLI_listbase.h"
#include "BLI_linklist.h"
#include "BLI_math_matrix.h"
-#include "lanpr_all.h"
-#include "DRW_render.h"
+#include "BLI_rect.h"
+
#include "BKE_object.h"
-#include "DNA_mesh_types.h"
+
+#include "DEG_depsgraph_query.h"
+
#include "DNA_camera_types.h"
-#include "GPU_immediate.h"
-#include "GPU_immediate_util.h"
-#include "GPU_framebuffer.h"
#include "DNA_lanpr_types.h"
-#include "GPU_draw.h"
-#include "DEG_depsgraph_query.h"
-#include "RE_pipeline.h"
-#include "BLI_rect.h"
+#include "DNA_mesh_types.h"
+
+#include "DRW_engine.h"
+#include "DRW_render.h"
#include "GPU_batch.h"
+#include "GPU_draw.h"
#include "GPU_framebuffer.h"
+#include "GPU_immediate.h"
+#include "GPU_immediate_util.h"
#include "GPU_shader.h"
#include "GPU_uniformbuffer.h"
#include "GPU_viewport.h"
+
+#include "RE_pipeline.h"
+
#include "bmesh.h"
+#include "lanpr_all.h"
#include <math.h>
diff --git a/source/blender/editors/include/ED_lanpr.h b/source/blender/editors/include/ED_lanpr.h
index 25182b726f5..34c9786b78c 100644
--- a/source/blender/editors/include/ED_lanpr.h
+++ b/source/blender/editors/include/ED_lanpr.h
@@ -24,19 +24,15 @@
#ifndef __ED_LANPR_H__
#define __ED_LANPR_H__
-#include <string.h>
#include "BLI_listbase.h"
#include "BLI_linklist.h"
-#include "BLI_threads.h"
-
-#include <math.h>
#include "BLI_math.h"
+#include "BLI_threads.h"
#include "DNA_lanpr_types.h"
-#ifndef BYTE
-# define BYTE unsigned char
-#endif
+#include <math.h>
+#include <string.h>
typedef double real;
diff --git a/source/blender/editors/lanpr/lanpr_chain.c b/source/blender/editors/lanpr/lanpr_chain.c
index 2983deb6134..05397f60ade 100644
--- a/source/blender/editors/lanpr/lanpr_chain.c
+++ b/source/blender/editors/lanpr/lanpr_chain.c
@@ -24,19 +24,22 @@
#include "BLI_listbase.h"
#include "BLI_linklist.h"
#include "BLI_math.h"
+
+#include "BKE_customdata.h"
#include "BKE_object.h"
-#include "DNA_mesh_types.h"
+
+#include "DEG_depsgraph_query.h"
+
#include "DNA_camera_types.h"
#include "DNA_lanpr_types.h"
-#include "DNA_scene_types.h"
+#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
-#include "BKE_customdata.h"
-#include "DEG_depsgraph_query.h"
-
-#include "bmesh.h"
+#include "DNA_scene_types.h"
#include "ED_lanpr.h"
+#include "bmesh.h"
+
#include <math.h>
#define LANPR_OTHER_RV(rl, rv) ((rv) == (rl)->l ? (rl)->r : (rl)->l)
diff --git a/source/blender/editors/lanpr/lanpr_cpu.c b/source/blender/editors/lanpr/lanpr_cpu.c
index df60d395a81..1254e6da079 100644
--- a/source/blender/editors/lanpr/lanpr_cpu.c
+++ b/source/blender/editors/lanpr/lanpr_cpu.c
@@ -998,7 +998,7 @@ static void lanpr_post_triangle(LANPR_RenderTriangle *rt, LANPR_RenderTriangle *
copy_v3_v3_db(rt->gn, orig->gn);
}
-#define RT_AT(head, rb, offset) ((BYTE *)head + offset * rb->triangle_size)
+#define RT_AT(head, rb, offset) ((unsigned char *)head + offset * rb->triangle_size)
static void lanpr_cull_triangles(LANPR_RenderBuffer *rb)
{
@@ -1028,7 +1028,7 @@ static void lanpr_cull_triangles(LANPR_RenderBuffer *rb)
veln = lanpr_new_cull_point_space64(rb);
teln = lanpr_new_cull_triangle_space64(rb);
rv = &((LANPR_RenderVert *)veln->pointer)[v_count];
- rt1 = (void *)(((BYTE *)teln->pointer) + rb->triangle_size * t_count);
+ rt1 = (void *)(((unsigned char *)teln->pointer) + rb->triangle_size * t_count);
for (reln = rb->triang
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list