[Bf-blender-cvs] [161e234] master: Cleanup: minmac -> minmax & RE_render_ext naming
Campbell Barton
noreply at git.blender.org
Tue Jan 26 21:45:35 CET 2016
Commit: 161e2343b7e1d749ced1bbac871d7f37778018d5
Author: Campbell Barton
Date: Wed Jan 27 07:32:48 2016 +1100
Branches: master
https://developer.blender.org/rB161e2343b7e1d749ced1bbac871d7f37778018d5
Cleanup: minmac -> minmax & RE_render_ext naming
Use more conventional API word-ordering for RE_render_ext
===================================================================
M source/blender/blenkernel/intern/blender.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/render/extern/include/RE_render_ext.h
M source/blender/render/intern/source/pointdensity.c
M source/blender/render/intern/source/render_texture.c
M source/blenderplayer/bad_level_call_stubs/stubs.c
M source/creator/creator.c
===================================================================
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index e7026f7..635fc1e 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 3ed1480..6c8eae6 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);
}
}
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 1401418..f06492e 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -3063,7 +3063,7 @@ void rna_ShaderNodePointDensity_density_cache(bNode *self,
pd->color_source = point_density_color_source_from_shader(shader_point_density);
/* Single-threaded sampling of the voxel domain. */
- RE_cache_point_density(scene,
+ RE_point_density_cache(scene,
pd,
settings == 1);
}
@@ -3091,7 +3091,7 @@ void rna_ShaderNodePointDensity_density_calc(bNode *self,
}
/* Single-threaded sampling of the voxel domain. */
- RE_sample_point_density(scene, pd,
+ RE_point_density_sample(scene, pd,
shader_point_density->resolution,
settings == 1,
*values);
@@ -3113,7 +3113,7 @@ void rna_ShaderNodePointDensity_density_minmax(bNode *self,
zero_v3(r_max);
return;
}
- RE_minmac_point_density(scene, pd, settings == 1, r_min, r_max);
+ RE_point_density_minmax(scene, pd, settings == 1, r_min, r_max);
}
#else
diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h
index d5af16d..b679866 100644
--- a/source/blender/render/extern/include/RE_render_ext.h
+++ b/source/blender/render/extern/include/RE_render_ext.h
@@ -42,44 +42,49 @@ struct ImagePool;
struct MTex;
struct Scene;
-/* particle.c, effect.c, editmesh_modes.c and brush.c, returns 1 if rgb, 0 otherwise */
-int externtex(struct MTex *mtex, const float vec[3], float *tin, float *tr, float *tg, float *tb, float *ta, const int thread, struct ImagePool *pool, const bool skip_load_image);
-
-/* particle.c */
+/* render_texture.c */
+/* used by particle.c, effect.c, editmesh_modes.c and brush.c, returns 1 if rgb, 0 otherwise */
+int externtex(
+ struct MTex *mtex, const float vec[3], float *tin, float *tr, float *tg, float *tb, float *ta,
+ const int thread, struct ImagePool *pool, const bool skip_load_image);
void texture_rgb_blend(float in[3], const float tex[3], const float out[3], float fact, float facg, int blendtype);
float texture_value_blend(float tex, float out, float fact, float facg, int blendtype);
-/* node_composite.c */
-void ibuf_sample(struct ImBuf *ibuf, float fx, float fy, float dx, float dy, float result[4]);
-void antialias_tagbuf(int xsize, int ysize, char *rectmove);
+void RE_texture_rng_init(void);
+void RE_texture_rng_exit(void);
-/* dynamicpaint.c */
-struct Material *RE_init_sample_material(struct Material *orig_mat, struct Scene *scene);
-void RE_free_sample_material(struct Material *mat);
+struct Material *RE_sample_material_init(struct Material *orig_mat, struct Scene *scene);
+void RE_sample_material_free(struct Material *mat);
void RE_sample_material_color(
struct Material *mat, float color[3], float *alpha, const float volume_co[3], const float surface_co[3],
int tri_index, struct DerivedMesh *orcoDm, struct Object *ob);
-/* pointdensity.c */
+/* imagetexture.c */
+void ibuf_sample(struct ImBuf *ibuf, float fx, float fy, float dx, float dy, float result[4]);
+
+/* zbuf.c */
+void antialias_tagbuf(int xsize, int ysize, char *rectmove);
+
+/* pointdensity.c */
struct PointDensity;
-void RE_cache_point_density(struct Scene *scene,
- struct PointDensity *pd,
- const bool use_render_params);
+void RE_point_density_cache(
+ struct Scene *scene,
+ struct PointDensity *pd,
+ const bool use_render_params);
-void RE_minmac_point_density(struct Scene *scene,
- struct PointDensity *pd,
- const bool use_render_params,
- float r_min[3],
- float r_max[3]);
+void RE_point_density_minmax(
+ struct Scene *scene,
+ struct PointDensity *pd,
+ const bool use_render_params,
+ float r_min[3], float r_max[3]);
-void RE_sample_point_density(struct Scene *scene,
- struct PointDensity *pd,
- const int resolution,
- const bool use_render_params,
- float *values);
+void RE_point_density_sample(
+ struct Scene *scene,
+ struct PointDensity *pd,
+ const int resolution,
+ const bool use_render_params,
+ float *values);
-void RE_init_texture_rng(void);
-void RE_exit_texture_rng(void);
#endif /* __RE_RENDER_EXT_H__ */
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index d98c472..1fcd618 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -715,9 +715,10 @@ static void particle_system_minmax(Scene *scene,
}
}
-void RE_cache_point_density(Scene *scene,
- PointDensity *pd,
- const bool use_render_params)
+void RE_point_density_cache(
+ Scene *scene,
+ PointDensity *pd,
+ const bool use_render_params)
{
float mat[4][4];
/* Same matricies/resolution as dupli_render_particle_set(). */
@@ -727,11 +728,11 @@ void RE_cache_point_density(Scene *scene,
BLI_mutex_unlock(&sample_mutex);
}
-void RE_minmac_point_density(struct Scene *scene,
- struct PointDensity *pd,
- const bool use_render_params,
- float r_min[3],
- float r_max[3])
+void RE_point_density_minmax(
+ struct Scene *scene,
+ struct PointDensity *pd,
+ const bool use_render_params,
+ float r_min[3], float r_max[3])
{
Object *object = pd->object;
if (object == NULL) {
@@ -770,14 +771,15 @@ void RE_minmac_point_density(struct Scene *scene,
}
}
-/* NOTE 1: Requires RE_cache_point_density() to be called first.
+/* NOTE 1: Requires RE_point_density_cache() to be called first.
* NOTE 2: Frees point density structure after sampling.
*/
-void RE_sample_point_density(Scene *scene,
- PointDensity *pd,
- const int resolution,
- const bool use_render_params,
- float *values)
+void RE_point_density_sample(
+ Scene *scene,
+ PointDensity *pd,
+ const int resolution,
+ const bool use_render_params,
+ float *values)
{
const size_t resolution2 = resolution * resolution;
Object *object = pd->object;
@@ -793,7 +795,7 @@ void RE_sample_point_density(Scene *scene,
return;
}
- RE_minmac_point_density(scene,
+ RE_point_density_minmax(scene,
pd,
use_render_params,
min,
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index f781d11..29d8f17 100644
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/source/render_texture.c
@@ -85,12 +85,12 @@ extern struct Render R;
static RNG_THREAD_ARRAY *random_tex_array;
-void RE_init_texture_rng(void)
+void RE_texture_rng_init(void)
{
random_tex_array = BLI_rng_threaded_new();
}
-void RE_exit_texture_rng(void)
+void RE_texture_rng_exit(void)
{
BLI_rng_threaded_free(random_tex_array);
}
@@ -3556,7 +3556,7 @@ static void textured_face_generate_uv(
}
/* Generate an updated copy of material to use for color sampling. */
-Material *RE_init_sample_material(Material *orig_mat, Scene *scene)
+Material *RE_sample_material_init(Material *orig_mat, Scene *scene)
{
Tex *tex = NULL;
Material *mat;
@@ -3644,8 +3644,8 @@ Material *RE_init_sample_material(Material *orig_mat, Scene *scene)
return mat;
}
-/* free all duplicate data allocated by RE_init_sample_material() */
-void RE_free_sample_material(Material *mat)
+/* free all duplicate data allocated by RE_sample_material_init() */
+void RE_sample_material_free(Material *mat)
{
int tex_nr;
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 82951bd..859e6d7 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -226,8 +226,8 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list