Commit: 68e0a477e940e02f87170d185c1c35eaa5ed6e22
Author: Campbell Barton
Date: Mon Apr 10 12:47:16 2017 +1000
Branches: soc-2016-pbvh-painting
https://developer.blender.org/rB68e0a477e940e02f87170d185c1c35eaa5ed6e22
Cleanup: remove redundant nested header
===================================================================
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/pbvh.c
M source/blender/editors/sculpt_paint/paint_vertex.c
M source/blender/editors/sculpt_paint/sculpt_intern.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_paint.h
b/source/blender/blenkernel/BKE_paint.h
index cac56ae66af..e3fdf66de87 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -28,8 +28,6 @@
#ifndef __BKE_PAINT_H__
#define __BKE_PAINT_H__
-#include "BKE_mesh_mapping.h"
-
/** \file BKE_paint.h
* \ingroup bke
*/
@@ -207,9 +205,9 @@ typedef struct SculptSession {
union {
struct {
int *vert_map_mem;
- MeshElemMap *vert_to_loop;
+ struct MeshElemMap *vert_to_loop;
int *poly_map_mem;
- MeshElemMap *vert_to_poly;
+ struct MeshElemMap *vert_to_poly;
unsigned int *total_color;
double *total_weight;
diff --git a/source/blender/blenkernel/BKE_pbvh.h
b/source/blender/blenkernel/BKE_pbvh.h
index bece60dd621..c8c32c582d3 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -190,7 +190,7 @@ void BKE_pbvh_node_num_verts(
void BKE_pbvh_node_get_verts(
PBVH *bvh, PBVHNode *node,
const int **r_vert_indices, struct MVert **r_verts);
-void BKE_pbvh_get_num_nodes(PBVH *bvh, int* r_totnode);
+void BKE_pbvh_get_num_nodes(const PBVH *bvh, int *r_totnode);
void BKE_pbvh_node_get_BB(PBVHNode *node, float bb_min[3], float bb_max[3]);
void BKE_pbvh_node_get_original_BB(PBVHNode *node, float bb_min[3], float
bb_max[3]);
diff --git a/source/blender/blenkernel/intern/object.c
b/source/blender/blenkernel/intern/object.c
index e5cf36a15f3..b493666cd05 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2684,7 +2684,7 @@ void BKE_object_sculpt_modifiers_changed(Object *ob)
BKE_sculptsession_free_deformMats(ob->sculpt);
- /* In VWpaint, force maps to be rebuilt. */
+ /* In vertex/weight paint, force maps to be rebuilt. */
BKE_sculptsession_free_vwpaint_data(ob->sculpt);
}
else {
diff --git a/source/blender/blenkernel/intern/paint.c
b/source/blender/blenkernel/intern/paint.c
index d10a1830ea9..b8dbfc6f71b 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -656,7 +656,8 @@ void BKE_sculptsession_free_deformMats(SculptSession *ss)
MEM_SAFE_FREE(ss->deform_imats);
}
-void BKE_sculptsession_free_vwpaint_data(struct SculptSession *ss) {
+void BKE_sculptsession_free_vwpaint_data(struct SculptSession *ss)
+{
/* Free maps */
MEM_SAFE_FREE(ss->modes.vwpaint.vert_to_loop);
MEM_SAFE_FREE(ss->modes.vwpaint.vert_map_mem);
diff --git a/source/blender/blenkernel/intern/pbvh.c
b/source/blender/blenkernel/intern/pbvh.c
index e3a5bd1363d..258322ea361 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -1403,7 +1403,8 @@ void BKE_pbvh_node_num_verts(
}
}
-void BKE_pbvh_get_num_nodes(PBVH *bvh, int* r_totnode) {
+void BKE_pbvh_get_num_nodes(const PBVH *bvh, int *r_totnode)
+{
*r_totnode = bvh->totnode;
}
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c
b/source/blender/editors/sculpt_paint/paint_vertex.c
index 7a643703bf8..2656c5b5639 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -60,6 +60,7 @@
#include "BKE_depsgraph.h"
#include "BKE_deform.h"
#include "BKE_mesh.h"
+#include "BKE_mesh_mapping.h"
#include "BKE_modifier.h"
#include "BKE_object_deform.h"
#include "BKE_paint.h"
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h
b/source/blender/editors/sculpt_paint/sculpt_intern.h
index 87623f6cd19..6b5c1bf7b95 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -194,7 +194,7 @@ typedef struct SculptThreadedTaskData {
WPaintData *wpd;
WeightPaintInfo *wpi;
unsigned int* lcol;
- MeshElemMap **vertToLoopMaps;
+ struct MeshElemMap **vertToLoopMaps;
Mesh *me;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
