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>2017-10-17 05:43:10 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-10-17 05:49:20 +0300
commit99520e3f92e14eb3b7fab3f7decd0914a3da1360 (patch)
tree79947d6dbf20e773b107359e9faddc5a17c0271b /source/blender/render
parent57ec19e0e5cbb96392eccf12d4ccc17c4cf9b65b (diff)
Cleanup: use 'e' prefix for enum typedefs
Convention was only followed loosely, apply to DNA where changes aren't likely to conflict. (Skipped ModifierType for eg).
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/extern/include/RE_bake.h12
-rw-r--r--source/blender/render/intern/source/bake_api.c12
-rw-r--r--source/blender/render/intern/source/external_engine.c2
3 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/render/extern/include/RE_bake.h b/source/blender/render/extern/include/RE_bake.h
index a04d1d6632c..090e0e6c28d 100644
--- a/source/blender/render/extern/include/RE_bake.h
+++ b/source/blender/render/extern/include/RE_bake.h
@@ -72,13 +72,13 @@ bool RE_bake_has_engine(struct Render *re);
bool RE_bake_engine(
struct Render *re, struct Object *object, const int object_id, const BakePixel pixel_array[],
- const size_t num_pixels, const int depth, const ScenePassType pass_type, const int pass_filter, float result[]);
+ const size_t num_pixels, const int depth, const eScenePassType pass_type, const int pass_filter, float result[]);
/* bake.c */
-int RE_pass_depth(const ScenePassType pass_type);
+int RE_pass_depth(const eScenePassType pass_type);
bool RE_bake_internal(
struct Render *re, struct Object *object, const BakePixel pixel_array[],
- const size_t num_pixels, const int depth, const ScenePassType pass_type, float result[]);
+ const size_t num_pixels, const int depth, const eScenePassType pass_type, float result[]);
bool RE_bake_pixels_populate_from_objects(
struct Mesh *me_low, BakePixel pixel_array_from[], BakePixel pixel_array_to[],
@@ -95,13 +95,13 @@ void RE_bake_margin(struct ImBuf *ibuf, char *mask, const int margin);
void RE_bake_normal_world_to_object(
const BakePixel pixel_array[], const size_t num_pixels, const int depth, float result[],
- struct Object *ob, const BakeNormalSwizzle normal_swizzle[3]);
+ struct Object *ob, const eBakeNormalSwizzle normal_swizzle[3]);
void RE_bake_normal_world_to_tangent(
const BakePixel pixel_array[], const size_t num_pixels, const int depth, float result[],
- struct Mesh *me, const BakeNormalSwizzle normal_swizzle[3], float mat[4][4]);
+ struct Mesh *me, const eBakeNormalSwizzle normal_swizzle[3], float mat[4][4]);
void RE_bake_normal_world_to_world(
const BakePixel pixel_array[], const size_t num_pixels, const int depth, float result[],
- const BakeNormalSwizzle normal_swizzle[3]);
+ const eBakeNormalSwizzle normal_swizzle[3]);
void RE_bake_ibuf_clear(struct Image *image, const bool is_tangent);
diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/source/bake_api.c
index 588c327ab91..505af3c2fa8 100644
--- a/source/blender/render/intern/source/bake_api.c
+++ b/source/blender/render/intern/source/bake_api.c
@@ -734,7 +734,7 @@ static void normal_uncompress(float out[3], const float in[3])
out[i] = 2.0f * in[i] - 1.0f;
}
-static void normal_compress(float out[3], const float in[3], const BakeNormalSwizzle normal_swizzle[3])
+static void normal_compress(float out[3], const float in[3], const eBakeNormalSwizzle normal_swizzle[3])
{
const int swizzle_index[6] = {
0, /* R_BAKE_POSX */
@@ -777,7 +777,7 @@ static void normal_compress(float out[3], const float in[3], const BakeNormalSwi
*/
void RE_bake_normal_world_to_tangent(
const BakePixel pixel_array[], const size_t num_pixels, const int depth,
- float result[], Mesh *me, const BakeNormalSwizzle normal_swizzle[3],
+ float result[], Mesh *me, const eBakeNormalSwizzle normal_swizzle[3],
float mat[4][4])
{
size_t i;
@@ -888,7 +888,7 @@ void RE_bake_normal_world_to_tangent(
void RE_bake_normal_world_to_object(
const BakePixel pixel_array[], const size_t num_pixels, const int depth,
- float result[], struct Object *ob, const BakeNormalSwizzle normal_swizzle[3])
+ float result[], struct Object *ob, const eBakeNormalSwizzle normal_swizzle[3])
{
size_t i;
float iobmat[4][4];
@@ -916,7 +916,7 @@ void RE_bake_normal_world_to_object(
void RE_bake_normal_world_to_world(
const BakePixel pixel_array[], const size_t num_pixels, const int depth,
- float result[], const BakeNormalSwizzle normal_swizzle[3])
+ float result[], const eBakeNormalSwizzle normal_swizzle[3])
{
size_t i;
@@ -975,7 +975,7 @@ static bool bake_uv(const BakePixel pixel_array[], const size_t num_pixels, cons
bool RE_bake_internal(
Render *UNUSED(re), Object *UNUSED(object), const BakePixel pixel_array[],
- const size_t num_pixels, const int depth, const ScenePassType pass_type, float result[])
+ const size_t num_pixels, const int depth, const eScenePassType pass_type, float result[])
{
switch (pass_type) {
case SCE_PASS_UV:
@@ -988,7 +988,7 @@ bool RE_bake_internal(
return false;
}
-int RE_pass_depth(const ScenePassType pass_type)
+int RE_pass_depth(const eScenePassType pass_type)
{
/* IMB_buffer_byte_from_float assumes 4 channels
* making it work for now - XXX */
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index a581f7bd198..55a6cbec549 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -503,7 +503,7 @@ bool RE_bake_engine(
Render *re, Object *object,
const int object_id, const BakePixel pixel_array[],
const size_t num_pixels, const int depth,
- const ScenePassType pass_type, const int pass_filter,
+ const eScenePassType pass_type, const int pass_filter,
float result[])
{
RenderEngineType *type = RE_engines_find(re->r.engine);