kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: remove unused face normals

Browse Source 
also use const
This commit is contained in:
Campbell Barton 2015-04-17 20:55:33 +10:00
parent 80b4b43727
commit 15d3d8560d
4 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extern/rangetree/range_tree_c_api.h vendored
View File

@ -14,8 +14,8 @@
02110-1301, USA. 02110-1301, USA.
*/ */
#ifndef RANGE_TREE_C_API_H #ifndef __RANGE_TREE_C_API_H__
#define RANGE_TREE_C_API_H #define __RANGE_TREE_C_API_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -59,4 +59,4 @@ unsigned int range_tree_uint_allocation_lower_bound(const RangeTreeUInt *rt);
} }
#endif #endif
#endif /* __DUALCON_H__ */ #endif /* __RANGE_TREE_C_API_H__ */

1
source/blender/blenkernel/BKE_paint.h
View File

@ -156,7 +156,6 @@ typedef struct SculptSession {
struct MPoly *mpoly; struct MPoly *mpoly;
struct MLoop *mloop; struct MLoop *mloop;
int totvert, totpoly; int totvert, totpoly;
float (*face_normals)[3];
struct KeyBlock *kb; struct KeyBlock *kb;
float *vmask; float *vmask;

2
source/blender/blenkernel/intern/paint.c
View File

@ -788,7 +788,6 @@ void BKE_sculpt_update_mesh_elements(Scene *scene, Sculpt *sd, Object *ob,
ss->mvert = NULL; ss->mvert = NULL;
ss->mpoly = NULL; ss->mpoly = NULL;
ss->mloop = NULL; ss->mloop = NULL;
ss->face_normals = NULL;
} }
else { else {
ss->totvert = me->totvert; ss->totvert = me->totvert;
@ -796,7 +795,6 @@ void BKE_sculpt_update_mesh_elements(Scene *scene, Sculpt *sd, Object *ob,
ss->mvert = me->mvert; ss->mvert = me->mvert;
ss->mpoly = me->mpoly; ss->mpoly = me->mpoly;
ss->mloop = me->mloop; ss->mloop = me->mloop;
ss->face_normals = NULL;
ss->multires = NULL; ss->multires = NULL;
ss->vmask = CustomData_get_layer(&me->vdata, CD_PAINT_MASK); ss->vmask = CustomData_get_layer(&me->vdata, CD_PAINT_MASK);
} }

25
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -182,8 +182,6 @@ typedef struct StrokeCache {
ViewContext *vc; ViewContext *vc;
Brush *brush; Brush *brush;
float (*face_norms)[3]; /* Copy of the mesh faces' normals */
float special_rotation; float special_rotation;
float grab_delta[3], grab_delta_symmetry[3]; float grab_delta[3], grab_delta_symmetry[3];
float old_grab_location[3], orig_grab_location[3]; float old_grab_location[3], orig_grab_location[3];
@ -345,9 +343,7 @@ static int sculpt_stroke_dynamic_topology(const SculptSession *ss,
static void paint_mesh_restore_co(Sculpt *sd, Object *ob) static void paint_mesh_restore_co(Sculpt *sd, Object *ob)
{ {
SculptSession *ss = ob->sculpt; SculptSession *ss = ob->sculpt;
StrokeCache *cache = ss->cache;
const Brush *brush = BKE_paint_brush(&sd->paint); const Brush *brush = BKE_paint_brush(&sd->paint);
int i;
PBVHNode **nodes; PBVHNode **nodes;
int n, totnode; int n, totnode;
@ -400,12 +396,6 @@ static void paint_mesh_restore_co(Sculpt *sd, Object *ob)
} }
} }
if (ss->face_normals) {
for (i = 0; i < ss->totpoly; i++) {
copy_v3_v3(ss->face_normals[i], cache->face_norms[i]);
}
}
if (nodes) if (nodes)
MEM_freeN(nodes); MEM_freeN(nodes);
} }
@ -505,7 +495,7 @@ static void sculpt_brush_test_init(SculptSession *ss, SculptBrushTest *test)
} }
} }
BLI_INLINE bool sculpt_brush_test_clipping(SculptBrushTest *test, const float co[3]) BLI_INLINE bool sculpt_brush_test_clipping(const SculptBrushTest *test, const float co[3])
{ {
RegionView3D *rv3d = test->clip_rv3d; RegionView3D *rv3d = test->clip_rv3d;
return (rv3d && (ED_view3d_clipping_test(rv3d, co, true))); return (rv3d && (ED_view3d_clipping_test(rv3d, co, true)));
@ -543,7 +533,7 @@ static bool sculpt_brush_test_sq(SculptBrushTest *test, const float co[3])
} }
} }
static bool sculpt_brush_test_fast(SculptBrushTest *test, float co[3]) static bool sculpt_brush_test_fast(const SculptBrushTest *test, const float co[3])
{ {
if (sculpt_brush_test_clipping(test, co)) { if (sculpt_brush_test_clipping(test, co)) {
return 0; return 0;
@ -551,7 +541,7 @@ static bool sculpt_brush_test_fast(SculptBrushTest *test, float co[3])
return len_squared_v3v3(co, test->location) <= test->radius_squared; return len_squared_v3v3(co, test->location) <= test->radius_squared;
} }
static bool sculpt_brush_test_cube(SculptBrushTest *test, float co[3], float local[4][4]) static bool sculpt_brush_test_cube(SculptBrushTest *test, const float co[3], float local[4][4])
{ {
float side = M_SQRT1_2; float side = M_SQRT1_2;
float local_co[3]; float local_co[3];
@ -3503,8 +3493,6 @@ static const char *sculpt_tool_name(Sculpt *sd)
static void sculpt_cache_free(StrokeCache *cache) static void sculpt_cache_free(StrokeCache *cache)
{ {
if (cache->face_norms)
MEM_freeN(cache->face_norms);
if (cache->dial) if (cache->dial)
MEM_freeN(cache->dial); MEM_freeN(cache->dial);
MEM_freeN(cache); MEM_freeN(cache);
@ -3764,13 +3752,6 @@ static void sculpt_update_cache_invariants(bContext *C, Sculpt *sd, SculptSessio
/* Make copies of the mesh vertex locations and normals for some tools */ /* Make copies of the mesh vertex locations and normals for some tools */
if (brush->flag & BRUSH_ANCHORED) { if (brush->flag & BRUSH_ANCHORED) {
if (ss->face_normals) {
cache->face_norms = MEM_mallocN(sizeof(float) * 3 * ss->totpoly, "Sculpt face norms");
for (i = 0; i < ss->totpoly; ++i) {
copy_v3_v3(cache->face_norms[i], ss->face_normals[i]);
}
}
cache->original = 1; cache->original = 1;
} }