[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48955] trunk/blender/source/blender: correct own naming error BLI -> BKE

[Campbell Barton]

Revision: 48955
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48955
Author:   campbellbarton
Date:     2012-07-16 08:53:11 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
correct own naming error BLI -> BKE

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_mask.h
    trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
    trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp

Modified: trunk/blender/source/blender/blenkernel/BKE_mask.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mask.h  2012-07-16 08:48:06 UTC 
(rev 48954)
+++ trunk/blender/source/blender/blenkernel/BKE_mask.h  2012-07-16 08:53:11 UTC 
(rev 48955)
@@ -213,13 +213,13 @@
 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__ */

Modified: trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c     
2012-07-16 08:48:06 UTC (rev 48954)
+++ trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c     
2012-07-16 08:53:11 UTC (rev 48955)
@@ -119,7 +119,7 @@
 /* alloc / free functions                                                */
 /* --------------------------------------------------------------------- */
 
-MaskRasterHandle *BLI_maskrasterize_handle_new(void)
+MaskRasterHandle *BKE_maskrasterize_handle_new(void)
 {
        MaskRasterHandle *mr_handle;
 
@@ -128,7 +128,7 @@
        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 @@
        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 @@
        }
 }
 
-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)) */

Modified: 
trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp    
2012-07-16 08:48:06 UTC (rev 48954)
+++ trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp    
2012-07-16 08:53:11 UTC (rev 48955)
@@ -152,9 +152,9 @@
                        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::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 @@
 {
        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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs