Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-01-26 23:32:48 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-01-26 23:37:33 +0300
commit161e2343b7e1d749ced1bbac871d7f37778018d5 (patch)
tree6c7bb4a40b77a6cbcac25388c86e001350a75ee7 /source/blender/blenkernel
parenta2b9633791ffbab446dd2a0d8902c60b05eaac15 (diff)
Cleanup: minmac -> minmax & RE_render_ext naming
Use more conventional API word-ordering for RE_render_ext
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/blender.c2
-rw-r--r--source/blender/blenkernel/intern/dynamicpaint.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index e7026f7ed71..635fc1e7a66 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -122,7 +122,7 @@ void free_blender(void)
DAG_exit();
BKE_brush_system_exit();
- RE_exit_texture_rng();
+ RE_texture_rng_exit();
BLI_callback_global_finalize();
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 3ed148023a3..6c8eae69ccc 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -2717,13 +2717,13 @@ static void dynamicPaint_updateBrushMaterials(Object *brushOb, Material *ui_mat,
if (tot) {
bMats->ob_mats = MEM_callocN(sizeof(Material *) * (tot), "BrushMaterials");
for (i = 0; i < tot; i++) {
- bMats->ob_mats[i] = RE_init_sample_material(give_current_material(brushOb, (i + 1)), scene);
+ bMats->ob_mats[i] = RE_sample_material_init(give_current_material(brushOb, (i + 1)), scene);
}
}
bMats->tot = tot;
}
else {
- bMats->mat = RE_init_sample_material(ui_mat, scene);
+ bMats->mat = RE_sample_material_init(ui_mat, scene);
}
}
@@ -2734,12 +2734,12 @@ static void dynamicPaint_freeBrushMaterials(BrushMaterials *bMats)
if (bMats->ob_mats) {
int i;
for (i = 0; i < bMats->tot; i++) {
- RE_free_sample_material(bMats->ob_mats[i]);
+ RE_sample_material_free(bMats->ob_mats[i]);
}
MEM_freeN(bMats->ob_mats);
}
else if (bMats->mat) {
- RE_free_sample_material(bMats->mat);
+ RE_sample_material_free(bMats->mat);
}
}