[Bf-blender-cvs] [1b34ac2] temp_custom_loop_normals: Cleanup: no need to include headers

Campbell Barton noreply at git.blender.org
Mon Nov 3 09:46:23 CET 2014


Commit: 1b34ac20f7982523eb46a6a1aa545f4d00e5b33d
Author: Campbell Barton
Date:   Mon Nov 3 09:02:05 2014 +0100
Branches: temp_custom_loop_normals
https://developer.blender.org/rB1b34ac20f7982523eb46a6a1aa545f4d00e5b33d

Cleanup: no need to include headers

===================================================================

M	source/blender/blenkernel/BKE_mesh.h

===================================================================

diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 998894a..0c0a45e 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -184,22 +184,18 @@ void BKE_mesh_loop_tangents_ex(
 void BKE_mesh_loop_tangents(
         struct Mesh *mesh, const char *uvmap, float (*r_looptangents)[4], struct ReportList *reports);
 
-/* XXX This is ugly! But other solution is to include those in each file using BKE_mesh.h :/ */
-#include "BLI_linklist.h"
-#include "BLI_memarena.h"
-
 typedef struct MLoopNorSpace {
-	float vec_lnor[3];   /* Automatically computed loop normal. */
-	float vec_ref[3];    /* Reference vector, orthogonal to vec_lnor. */
-	float vec_ortho[3];  /* Third vector, orthogonal to vec_lnor and vec_ref. */
-	float ref_alpha;     /* Reference angle, around vec_ortho, in ]0, pi] range (0.0 marks that space as invalid). */
-	float ref_beta;      /* Reference angle, around vec_lnor, in ]0, 2pi] range (0.0 marks that space as invalid). */
-	LinkNode *loops;     /* All indices (uint_in_ptr) of loops using this lnor space (i.e. smooth fan of loops). */
+	float vec_lnor[3];      /* Automatically computed loop normal. */
+	float vec_ref[3];       /* Reference vector, orthogonal to vec_lnor. */
+	float vec_ortho[3];     /* Third vector, orthogonal to vec_lnor and vec_ref. */
+	float ref_alpha;        /* Reference angle, around vec_ortho, in ]0, pi] range (0.0 marks that space as invalid). */
+	float ref_beta;         /* Reference angle, around vec_lnor, in ]0, 2pi] range (0.0 marks that space as invalid). */
+	struct LinkNode *loops; /* All indices (uint_in_ptr) of loops using this lnor space (i.e. smooth fan of loops). */
 } MLoopNorSpace;
 typedef struct MLoopsNorSpaces {
 	MLoopNorSpace **lspaces;
-	LinkNode *loops_pool;  /* Allocated once, avoids to call BLI_linklist_prepend_arena() for each loop! */
-	MemArena *mem;
+	struct LinkNode *loops_pool;  /* Allocated once, avoids to call BLI_linklist_prepend_arena() for each loop! */
+	struct MemArena *mem;
 } MLoopsNorSpaces;
 void BKE_lnor_spaces_init(MLoopsNorSpaces *lnors_spaces, const int numLoops);
 void BKE_lnor_spaces_free(MLoopsNorSpaces *lnors_spaces);




More information about the Bf-blender-cvs mailing list