tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

correct own naming error BLI -> BKE

This commit is contained in:
Campbell Barton 2012-07-16 08:53:11 +00:00
parent 4cacff2342
commit a2e2489f61
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/BKE_mask.h
View File

@ -213,13 +213,13 @@ void BKE_mask_init_layers(Mask *mask, struct layer_init_data *mlayer_data, int w
struct MaskRasterHandle;
typedef struct MaskRasterHandle MaskRasterHandle;
MaskRasterHandle *BLI_maskrasterize_handle_new(void);
void BLI_maskrasterize_handle_free(MaskRasterHandle *mr_handle);
void BLI_maskrasterize_handle_init(MaskRasterHandle *mr_handle, struct Mask *mask,
MaskRasterHandle *BKE_maskrasterize_handle_new(void);
void BKE_maskrasterize_handle_free(MaskRasterHandle *mr_handle);
void BKE_maskrasterize_handle_init(MaskRasterHandle *mr_handle, struct Mask *mask,
const int width, const int height,
const short do_aspect_correct, const short do_mask_aa,
const short do_feather);
float BLI_maskrasterize_handle_sample(MaskRasterHandle *mr_handle, const float xy[2]);
float BKE_maskrasterize_handle_sample(MaskRasterHandle *mr_handle, const float xy[2]);
#endif /* USE_RASKTER */
#endif /* __BKE_MASK_H__ */

8
source/blender/blenkernel/intern/mask_rasterize.c
View File

@ -119,7 +119,7 @@ struct MaskRasterHandle {
/* alloc / free functions */
/* --------------------------------------------------------------------- */
MaskRasterHandle *BLI_maskrasterize_handle_new(void)
MaskRasterHandle *BKE_maskrasterize_handle_new(void)
{
MaskRasterHandle *mr_handle;
@ -128,7 +128,7 @@ MaskRasterHandle *BLI_maskrasterize_handle_new(void)
return mr_handle;
}
void BLI_maskrasterize_handle_free(MaskRasterHandle *mr_handle)
void BKE_maskrasterize_handle_free(MaskRasterHandle *mr_handle)
{
const unsigned int layers_tot = mr_handle->layers_tot;
unsigned int i;
@ -452,7 +452,7 @@ static void layer_bucket_init(MaskRasterLayer *layer, const float pixel_size)
BLI_memarena_free(arena);
}
void BLI_maskrasterize_handle_init(MaskRasterHandle *mr_handle, struct Mask *mask,
void BKE_maskrasterize_handle_init(MaskRasterHandle *mr_handle, struct Mask *mask,
const int width, const int height,
const short do_aspect_correct, const short do_mask_aa,
const short do_feather)
@ -963,7 +963,7 @@ static float layer_bucket_depth_from_xy(MaskRasterLayer *layer, const float xy[2
}
}
float BLI_maskrasterize_handle_sample(MaskRasterHandle *mr_handle, const float xy[2])
float BKE_maskrasterize_handle_sample(MaskRasterHandle *mr_handle, const float xy[2])
{
/* can't do this because some layers may invert */
/* if (BLI_in_rctf_v(&mr_handle->bounds, xy)) */

8
source/blender/compositor/operations/COM_MaskOperation.cpp
View File

@ -152,9 +152,9 @@ void MaskOperation::initExecution()
const int width = this->getWidth();
const int height = this->getHeight();
this->m_rasterMaskHandle = BLI_maskrasterize_handle_new();
this->m_rasterMaskHandle = BKE_maskrasterize_handle_new();
BLI_maskrasterize_handle_init(this->m_rasterMaskHandle, this->m_mask, width, height, TRUE, this->m_do_smooth, this->m_do_feather);
BKE_maskrasterize_handle_init(this->m_rasterMaskHandle, this->m_mask, width, height, TRUE, this->m_do_smooth, this->m_do_feather);
}
}
}
@ -162,7 +162,7 @@ void MaskOperation::initExecution()
void MaskOperation::deinitExecution()
{
if (this->m_rasterMaskHandle) {
BLI_maskrasterize_handle_free(this->m_rasterMaskHandle);
BKE_maskrasterize_handle_free(this->m_rasterMaskHandle);
this->m_rasterMaskHandle = NULL;
}
@ -197,7 +197,7 @@ void MaskOperation::executePixel(float *color, int x, int y, void *data)
{
const float xy[2] = {x / (float)this->m_maskWidth, y / (float)this->m_maskHeight};
if (this->m_rasterMaskHandle) {
color[0] = BLI_maskrasterize_handle_sample(this->m_rasterMaskHandle, xy);
color[0] = BKE_maskrasterize_handle_sample(this->m_rasterMaskHandle, xy);
}
else {
color[0] = 0.0f;