Commit: f905eba7c89de599fb0d10d941ce801481bb3a00
Author: Campbell Barton
Date: Sat Jul 12 19:58:35 2014 +1000
https://developer.blender.org/rBf905eba7c89de599fb0d10d941ce801481bb3a00
rename DM_active_paint_uvlayer, BKE_free_paint_curve
===================================================================
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/gpu/intern/gpu_buffers.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h
b/source/blender/blenkernel/BKE_DerivedMesh.h
index 2e7e14d..868d976 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -595,7 +595,7 @@ void DM_ensure_tessface(DerivedMesh *dm);
void DM_update_tessface_data(DerivedMesh *dm);
void DM_update_materials(DerivedMesh *dm, struct Object *ob);
-struct MTFace *DM_active_paint_uvlayer(DerivedMesh *dm, int mat_nr);
+struct MTFace *DM_paint_uvlayer_active_get(DerivedMesh *dm, int mat_nr);
/** interpolates vertex data from the vertices indexed by src_indices in the
* source mesh using the given weights and stores the result in the vertex
diff --git a/source/blender/blenkernel/BKE_paint.h
b/source/blender/blenkernel/BKE_paint.h
index e2e1ebf..66f4dac 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -107,7 +107,7 @@ void BKE_palette_cleanup(struct Palette
*palette);
/* paint curves */
struct PaintCurve *BKE_paint_curve_add(struct Main *bmain, const char *name);
-void BKE_free_paint_curve(struct PaintCurve *pc);
+void BKE_paint_curve_free(struct PaintCurve *pc);
void BKE_paint_init(struct Paint *p, const char col[3]);
void BKE_paint_free(struct Paint *p);
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c
b/source/blender/blenkernel/intern/DerivedMesh.c
index 6bdf80e..bdfaf9a 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -510,7 +510,7 @@ void DM_update_materials(DerivedMesh *dm, Object *ob)
}
}
-MTFace *DM_active_paint_uvlayer(DerivedMesh *dm, int mat_nr)
+MTFace *DM_paint_uvlayer_active_get(DerivedMesh *dm, int mat_nr)
{
MTFace *tf_base;
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c
b/source/blender/blenkernel/intern/cdderivedmesh.c
index d3f26b9..ca4a4b3 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -738,7 +738,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
if (uvflag & DM_DRAW_USE_TEXPAINT_UV) {
if (mf->mat_nr != mat_nr_cache) {
- tf_base = DM_active_paint_uvlayer(dm,
mf->mat_nr);
+ tf_base =
DM_paint_uvlayer_active_get(dm, mf->mat_nr);
mat_nr_cache = mf->mat_nr;
}
diff --git a/source/blender/blenkernel/intern/library.c
b/source/blender/blenkernel/intern/library.c
index 8ff9bd6..e5b929b 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1024,7 +1024,7 @@ void BKE_libblock_free_ex(Main *bmain, void *idv, bool
do_id_user)
BKE_palette_free((Palette *)id);
break;
case ID_PC:
- BKE_free_paint_curve((PaintCurve *)id);
+ BKE_paint_curve_free((PaintCurve *)id);
break;
}
diff --git a/source/blender/blenkernel/intern/paint.c
b/source/blender/blenkernel/intern/paint.c
index 7a3a1eb..1d5bb14 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -271,7 +271,7 @@ void BKE_paint_brush_set(Paint *p, Brush *br)
}
}
-void BKE_free_paint_curve(PaintCurve *pc)
+void BKE_paint_curve_free(PaintCurve *pc)
{
if (pc->points) {
MEM_freeN(pc->points);
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c
b/source/blender/blenkernel/intern/subsurf_ccg.c
index 0247e59..79c348a 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2349,7 +2349,7 @@ static void ccgDM_drawFacesTex_common(DerivedMesh *dm,
/* texture painting, handle the correct uv layer here */
if (flag & DM_DRAW_USE_TEXPAINT_UV) {
if (mat_nr != mat_nr_cache) {
- tf_base = DM_active_paint_uvlayer(dm, mat_nr);
+ tf_base = DM_paint_uvlayer_active_get(dm,
mat_nr);
mat_nr_cache = mat_nr;
}
diff --git a/source/blender/gpu/intern/gpu_buffers.c
b/source/blender/gpu/intern/gpu_buffers.c
index d660b32..ea25324 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -859,7 +859,7 @@ static void GPU_buffer_copy_uv_texpaint(DerivedMesh *dm,
float *varray, int *ind
mtface_base = MEM_mallocN(totmaterial * sizeof(*mtface_base),
"texslots");
for (i = 0; i < totmaterial; i++) {
- mtface_base[i] = DM_active_paint_uvlayer(dm, i);
+ mtface_base[i] = DM_paint_uvlayer_active_get(dm, i);
}
stencil = CustomData_get_stencil_layer(&dm->faceData, CD_MTFACE);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
