From fcbf66df25a7a749869c564120311cefc7df7070 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Tue, 27 Mar 2012 14:31:11 +0000
Subject: [PATCH] tag some more methods BLOCKING

---
 panda/src/gobj/texturePool.h  | 34 +++++++++++++++++-----------------
 panda/src/pgraph/modelPool.h  |  4 ++--
 panda/src/pgraph/shaderPool.h |  2 +-
 panda/src/text/fontPool.h     |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/panda/src/gobj/texturePool.h b/panda/src/gobj/texturePool.h
index 99d742adfc..995a705794 100644
--- a/panda/src/gobj/texturePool.h
+++ b/panda/src/gobj/texturePool.h
@@ -41,25 +41,25 @@ class EXPCL_PANDA_GOBJ TexturePool {
 PUBLISHED:
   INLINE static bool has_texture(const Filename &filename);
   INLINE static bool verify_texture(const Filename &filename);
-  INLINE static Texture *load_texture(const Filename &filename, 
-                                      int primary_file_num_channels = 0,
-                                      bool read_mipmaps = false,
-                                      const LoaderOptions &options = LoaderOptions());
-  INLINE static Texture *load_texture(const Filename &filename,
-                                      const Filename &alpha_filename, 
-                                      int primary_file_num_channels = 0,
-                                      int alpha_file_channel = 0,
-                                      bool read_mipmaps = false,
-                                      const LoaderOptions &options = LoaderOptions());
-  INLINE static Texture *load_3d_texture(const Filename &filename_pattern,
-                                         bool read_mipmaps = false,
-                                         const LoaderOptions &options = LoaderOptions());
-  INLINE static Texture *load_2d_texture_array(const Filename &filename_pattern,
+  BLOCKING INLINE static Texture *load_texture(const Filename &filename, 
+                                               int primary_file_num_channels = 0,
                                                bool read_mipmaps = false,
                                                const LoaderOptions &options = LoaderOptions());
-  INLINE static Texture *load_cube_map(const Filename &filename_pattern,
-                                       bool read_mipmaps = false,
-                                       const LoaderOptions &options = LoaderOptions());
+  BLOCKING INLINE static Texture *load_texture(const Filename &filename,
+                                               const Filename &alpha_filename, 
+                                               int primary_file_num_channels = 0,
+                                               int alpha_file_channel = 0,
+                                               bool read_mipmaps = false,
+                                               const LoaderOptions &options = LoaderOptions());
+  BLOCKING INLINE static Texture *load_3d_texture(const Filename &filename_pattern,
+                                                  bool read_mipmaps = false,
+                                                  const LoaderOptions &options = LoaderOptions());
+  BLOCKING INLINE static Texture *load_2d_texture_array(const Filename &filename_pattern,
+                                                        bool read_mipmaps = false,
+                                                        const LoaderOptions &options = LoaderOptions());
+  BLOCKING INLINE static Texture *load_cube_map(const Filename &filename_pattern,
+                                                bool read_mipmaps = false,
+                                                const LoaderOptions &options = LoaderOptions());
 
   INLINE static Texture *get_normalization_cube_map(int size);
   INLINE static Texture *get_alpha_scale_map();
diff --git a/panda/src/pgraph/modelPool.h b/panda/src/pgraph/modelPool.h
index 3ab7ace640..264da21243 100644
--- a/panda/src/pgraph/modelPool.h
+++ b/panda/src/pgraph/modelPool.h
@@ -49,8 +49,8 @@ class EXPCL_PANDA_PGRAPH ModelPool {
 PUBLISHED:
   INLINE static bool has_model(const Filename &filename);
   INLINE static bool verify_model(const Filename &filename);
-  INLINE static ModelRoot *load_model(const Filename &filename,
-                                      const LoaderOptions &options = LoaderOptions());
+  BLOCKING INLINE static ModelRoot *load_model(const Filename &filename,
+                                               const LoaderOptions &options = LoaderOptions());
 
   INLINE static void add_model(const Filename &filename, ModelRoot *model);
   INLINE static void release_model(const Filename &filename);
diff --git a/panda/src/pgraph/shaderPool.h b/panda/src/pgraph/shaderPool.h
index e1d5b48e6a..2a4bff80a5 100644
--- a/panda/src/pgraph/shaderPool.h
+++ b/panda/src/pgraph/shaderPool.h
@@ -32,7 +32,7 @@ class EXPCL_PANDA_PGRAPH ShaderPool {
 PUBLISHED:
   INLINE static bool has_shader(const Filename &filename);
   INLINE static bool verify_shader(const Filename &filename);
-  INLINE static CPT(Shader) load_shader(const Filename &filename);
+  BLOCKING INLINE static CPT(Shader) load_shader(const Filename &filename);
   INLINE static void add_shader(const Filename &filename, Shader *shader);
   INLINE static void release_shader(const Filename &filename);
   INLINE static void release_all_shaders();
diff --git a/panda/src/text/fontPool.h b/panda/src/text/fontPool.h
index 0895d0fe37..ba4a501324 100644
--- a/panda/src/text/fontPool.h
+++ b/panda/src/text/fontPool.h
@@ -38,7 +38,7 @@ PUBLISHED:
 
   INLINE static bool has_font(const string &filename);
   INLINE static bool verify_font(const string &filename);
-  INLINE static TextFont *load_font(const string &filename);
+  BLOCKING INLINE static TextFont *load_font(const string &filename);
   INLINE static void add_font(const string &filename, TextFont *font);
   INLINE static void release_font(const string &filename);
   INLINE static void release_all_fonts();