diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-05-09 03:43:18 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-05-09 03:43:18 +0400 |
| commit | 6ef77cf95accc3cb914e7efd964118ce6e9521cf (patch) | |
| tree | 1d8dbf95355038c93f79f9053a0bf1d55b561ec3 /source/blender/gpu/intern/gpu_draw.c | |
| parent | 3462ddf17f38eb61fc3bb2751d55de15a47455c3 (diff) | |
| parent | 770119d16f7dbee99a60d19540818892c970c4e2 (diff) | |
=bmesh= merge from trunk at r36529
Diffstat (limited to 'source/blender/gpu/intern/gpu_draw.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 8594743f61d..c98f012bc1a 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -210,8 +210,8 @@ static int is_pow2_limit(int num) /* take texture clamping into account */ /* XXX: texturepaint not global! - if (G.f & G_TEXTUREPAINT) - return 1;*/ + if (G.f & G_TEXTUREPAINT) + return 1;*/ if (U.glreslimit != 0 && num > U.glreslimit) return 0; @@ -222,8 +222,8 @@ static int is_pow2_limit(int num) static int smaller_pow2_limit(int num) { /* XXX: texturepaint not global! - if (G.f & G_TEXTUREPAINT) - return 1;*/ + if (G.f & G_TEXTUREPAINT) + return 1;*/ /* take texture clamping into account */ if (U.glreslimit != 0 && num > U.glreslimit) @@ -531,7 +531,7 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, int compare, int } /* scale if not a power of two */ - if ((!is_pow2_limit(rectw) || !is_pow2_limit(recth))) { + if (!is_pow2_limit(rectw) || !is_pow2_limit(recth)) { rectw= smaller_pow2_limit(rectw); recth= smaller_pow2_limit(recth); @@ -793,7 +793,7 @@ static ListBase image_free_queue = {NULL, NULL}; static void gpu_queue_image_for_free(Image *ima) { - Image *cpy = MEM_dupallocN(ima); + Image *cpy = MEM_dupallocN(ima); BLI_lock_thread(LOCK_OPENGL); BLI_addtail(&image_free_queue, cpy); |