[Bf-blender-cvs] [3bba36a] cycles-ptex-49: Minor code cleanups for Ptex

[Nicholas Bishop]

Commit: 3bba36a9433b8dcd03be3180e1f3f49372dbec24
Author: Nicholas Bishop
Date:   Sat Feb 7 22:56:03 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rB3bba36a9433b8dcd03be3180e1f3f49372dbec24

Minor code cleanups for Ptex

===================================================================

M       source/blender/gpu/intern/gpu_codegen.h
M       source/blender/imbuf/intern/IMB_filetype.h
M       source/blender/imbuf/intern/filetype.c
M       source/blender/imbuf/intern/imb_ptex.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_codegen.h 
b/source/blender/gpu/intern/gpu_codegen.h
index 14bc1bd..3ba3e75 100644
--- a/source/blender/gpu/intern/gpu_codegen.h
+++ b/source/blender/gpu/intern/gpu_codegen.h
@@ -179,9 +179,7 @@ GPUPass *GPU_generate_pass(ListBase *nodes, struct 
GPUNodeLink *outlink,
 
 struct GPUShader *GPU_pass_shader(GPUPass *pass);
 
-void GPU_pass_bind(GPUPass *pass, double time, int mipmap,
-                                  // TODO
-                                  struct Object *ob);
+void GPU_pass_bind(GPUPass *pass, double time, int mipmap, struct Object *ob);
 void GPU_pass_update_uniforms(GPUPass *pass);
 void GPU_pass_unbind(GPUPass *pass);
 
diff --git a/source/blender/imbuf/intern/IMB_filetype.h 
b/source/blender/imbuf/intern/IMB_filetype.h
index ba8bda0..815192f 100644
--- a/source/blender/imbuf/intern/IMB_filetype.h
+++ b/source/blender/imbuf/intern/IMB_filetype.h
@@ -122,8 +122,6 @@ void imb_loadtiletiff(struct ImBuf *ibuf, unsigned char 
*mem, size_t size,
 int imb_savetiff(struct ImBuf *ibuf, const char *name, int flags);
 
 /* ptex */
-void imb_init_ptex(void);
-void imb_exit_ptex(void);
 int imb_is_a_ptex(unsigned char *buf);
 int imb_is_a_ptex_filepath(const char *name);
 struct ImBuf *imb_load_ptex_filepath(const char *name, int flags,
diff --git a/source/blender/imbuf/intern/filetype.c 
b/source/blender/imbuf/intern/filetype.c
index 52fd512..d9ade33 100644
--- a/source/blender/imbuf/intern/filetype.c
+++ b/source/blender/imbuf/intern/filetype.c
@@ -91,7 +91,7 @@ ImFileType IMB_FILE_TYPES[] = {
 #endif
        /* TODO */
        //#ifdef WITH_PTEX
-       {imb_init_ptex, imb_exit_ptex, imb_is_a_ptex, imb_is_a_ptex_filepath,
+       {NULL, NULL, imb_is_a_ptex, imb_is_a_ptex_filepath,
         imb_ftype_default, NULL /* load */, imb_load_ptex_filepath,
         NULL /* save */, NULL /* load_tile */, IM_FTYPE_FLOAT, IMB_PTEX,
         COLOR_ROLE_DEFAULT_BYTE},
diff --git a/source/blender/imbuf/intern/imb_ptex.c 
b/source/blender/imbuf/intern/imb_ptex.c
index caca591..a6c9b3c 100644
--- a/source/blender/imbuf/intern/imb_ptex.c
+++ b/source/blender/imbuf/intern/imb_ptex.c
@@ -12,16 +12,6 @@
 
 /* TODO(nicholasbishop): color space stuff */
 
-void imb_init_ptex(void)
-{
-       // TODO
-}
-
-void imb_exit_ptex(void)
-{
-       // TODO
-}
-
 int imb_is_a_ptex(unsigned char *buf)
 {
        unsigned char magic[4] = "Ptex";

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