[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60347] branches/soc-2013-viewport_fx/ source/blender/gpu: missed adding GPU_pixels.h to CMakeLists.txt, also renamed GPU_uncache_pixels to GPU_pixels_uncache ( was inconsistent with GPU_pixels_cache)
Jason Wilkins
Jason.A.Wilkins at gmail.com
Tue Sep 24 01:01:13 CEST 2013
Revision: 60347
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60347
Author: jwilkins
Date: 2013-09-23 23:01:13 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
missed adding GPU_pixels.h to CMakeLists.txt, also renamed GPU_uncache_pixels to GPU_pixels_uncache (was inconsistent with GPU_pixels_cache)
Modified Paths:
--------------
branches/soc-2013-viewport_fx/source/blender/gpu/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_pixels.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_pixels.c
Modified: branches/soc-2013-viewport_fx/source/blender/gpu/CMakeLists.txt
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/CMakeLists.txt 2013-09-23 22:32:01 UTC (rev 60346)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/CMakeLists.txt 2013-09-23 23:01:13 UTC (rev 60347)
@@ -132,6 +132,7 @@
GPU_lighting.h
GPU_material.h
GPU_matrix.h
+ GPU_pixels.h
GPU_primitives.h
GPU_raster.h
GPU_safety.h
Modified: branches/soc-2013-viewport_fx/source/blender/gpu/GPU_pixels.h
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/GPU_pixels.h 2013-09-23 22:32:01 UTC (rev 60346)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/GPU_pixels.h 2013-09-23 23:01:13 UTC (rev 60347)
@@ -60,8 +60,8 @@
void GPU_bitmap_cache(GPUbitmap* bitmap);
void GPU_pixels_cache(GPUpixels* pixels);
-void GPU_uncache_bitmap(GPUbitmap* bitmap);
-void GPU_uncache_pixels(GPUpixels* pixels);
+void GPU_bitmap_uncache(GPUbitmap* bitmap);
+void GPU_pixels_uncache(GPUpixels* pixels);
void GPU_pixels_zoom(GLfloat xfactor, GLfloat yfactor);
void GPU_get_pixels_zoom(GLfloat* xfactor_out, GLfloat *yfactor_out);
Modified: branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_pixels.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_pixels.c 2013-09-23 22:32:01 UTC (rev 60346)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_pixels.c 2013-09-23 23:01:13 UTC (rev 60347)
@@ -94,13 +94,13 @@
-void GPU_uncache_bitmap(GPUbitmap* bitmap)
+void GPU_bitmap_uncache(GPUbitmap* bitmap)
{
}
-void GPU_uncache_pixels(GPUpixels* pixels)
+void GPU_pixels_uncache(GPUpixels* pixels)
{
}
More information about the Bf-blender-cvs
mailing list