[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49674] branches/soc-2012-swiss_cheese/ source: header fixup, aspect api, warning fixes, removed some minor use of display lists, lots of other misc.
Jason Wilkins
Jason.A.Wilkins at gmail.com
Wed Aug 8 00:56:40 CEST 2012
Revision: 49674
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49674
Author: jwilkins
Date: 2012-08-07 22:56:39 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
header fixup, aspect api, warning fixes, removed some minor use of display lists, lots of other misc. changes.
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c
branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_dir.c
branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_font.c
branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/smoke.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/math_matrix.c
branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_markers.c
branches/soc-2012-swiss_cheese/source/blender/editors/animation/keyframes_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/armature/editarmature.c
branches/soc-2012-swiss_cheese/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2012-swiss_cheese/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2012-swiss_cheese/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_icons.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_panel.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_regions.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/resources.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/view2d.c
branches/soc-2012-swiss_cheese/source/blender/editors/mask/mask_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editface.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_select.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_slide.c
branches/soc-2012-swiss_cheese/source/blender/editors/physics/particle_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/render/render_opengl.c
branches/soc-2012-swiss_cheese/source/blender/editors/render/render_preview.c
branches/soc-2012-swiss_cheese/source/blender/editors/screen/area.c
branches/soc-2012-swiss_cheese/source/blender/editors/screen/glutil.c
branches/soc-2012-swiss_cheese/source/blender/editors/screen/screen_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/screen/screendump.c
branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_action/action_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_action/space_action.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/clip_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/clip_editor.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/clip_utils.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/space_clip.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_console/console_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_console/space_console.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_file/file_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_file/space_file.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_graph/graph_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_graph/space_graph.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/image_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/space_image.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_info/info_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_info/space_info.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_info/textview.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_logic/logic_window.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_logic/space_logic.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_nla/nla_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_nla/space_nla.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/drawnode.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/node_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/editors/space_script/space_script.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_text/space_text.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_text/text_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_time/space_time.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_constraints.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_manipulator.c
branches/soc-2012-swiss_cheese/source/blender/editors/util/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2012-swiss_cheese/source/blender/gpu/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_compatibility.h
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_matrix.h
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_primitives.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_codegen.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_debug.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_deprecated.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_draw.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_inline.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_material.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_matrix.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_object_gl11.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_primitives.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_window.c
branches/soc-2012-swiss_cheese/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2012-swiss_cheese/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2012-swiss_cheese/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/BL_Texture.h
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_Dome.h
branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.h
branches/soc-2012-swiss_cheese/source/gameengine/VideoTexture/ImageBase.cpp
branches/soc-2012-swiss_cheese/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2012-swiss_cheese/source/gameengine/VideoTexture/ImageViewport.cpp
branches/soc-2012-swiss_cheese/source/gameengine/VideoTexture/ImageViewport.h
branches/soc-2012-swiss_cheese/source/gameengine/VideoTexture/Texture.cpp
Added Paths:
-----------
branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_fx.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspect.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspect.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspectfuncs.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_aspectfuncs.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_framebuffer.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_glew.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_safety.h
Removed Paths:
-------------
branches/soc-2012-swiss_cheese/source/blender/editors/include/BIF_gl.h
Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c 2012-08-07 22:56:39 UTC (rev 49674)
@@ -44,7 +44,6 @@
#include "DNA_listBase.h"
#include "DNA_vec_types.h"
-#include "BIF_gl.h"
#include "BLF_api.h"
#include "blf_internal_types.h"
Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_dir.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_dir.c 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_dir.c 2012-08-07 22:56:39 UTC (rev 49674)
@@ -45,8 +45,6 @@
#include "BLI_blenlib.h"
-#include "BIF_gl.h"
-
#include "BLF_api.h"
#include "blf_internal_types.h"
#include "blf_internal.h"
Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_font.c 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_font.c 2012-08-07 22:56:39 UTC (rev 49674)
@@ -48,7 +48,6 @@
#include "BLI_linklist.h" /* linknode */
#include "BLI_math.h"
-#include "BIF_gl.h"
#include "BLF_api.h"
#include "blf_internal_types.h"
Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_glyph.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_glyph.c 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_glyph.c 2012-08-07 22:56:39 UTC (rev 49674)
@@ -48,7 +48,6 @@
#include "BLI_blenlib.h"
-#include "BIF_gl.h"
#include "BLF_api.h"
#include "blf_internal_types.h"
Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_internal_types.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_internal_types.h 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_internal_types.h 2012-08-07 22:56:39 UTC (rev 49674)
@@ -31,6 +31,8 @@
#ifndef __BLF_INTERNAL_TYPES_H__
#define __BLF_INTERNAL_TYPES_H__
+#include "GPU_compatibility.h"
+
typedef struct GlyphCacheBLF {
struct GlyphCacheBLF *next;
struct GlyphCacheBLF *prev;
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/DerivedMesh.c 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/DerivedMesh.c 2012-08-07 22:56:39 UTC (rev 49674)
@@ -76,8 +76,6 @@
#include "BLO_sys_types.h" /* for intptr_t support */
-#include "GL/glew.h"
-
#include "GPU_buffers.h"
#include "GPU_draw.h"
#include "GPU_extensions.h"
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/cdderivedmesh.c 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/cdderivedmesh.c 2012-08-07 22:56:39 UTC (rev 49674)
@@ -34,8 +34,6 @@
* \ingroup bke
*/
-#include "GL/glew.h"
-
#include "BLI_math.h"
#include "BLI_blenlib.h"
#include "BLI_edgehash.h"
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/editderivedmesh.c 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/editderivedmesh.c 2012-08-07 22:56:39 UTC (rev 49674)
@@ -33,8 +33,6 @@
#include <limits.h>
#include <math.h>
-#include "GL/glew.h"
-
#include "BLI_utildefines.h"
#include "BLI_blenlib.h"
#include "BLI_edgehash.h"
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/smoke.c 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/smoke.c 2012-08-07 22:56:39 UTC (rev 49674)
@@ -33,8 +33,6 @@
/* Part of the code copied from elbeem fluid library, copyright by Nils Thuerey */
-#include <GL/glew.h>
-
#include "MEM_guardedalloc.h"
#include <float.h>
@@ -77,6 +75,8 @@
#include "BKE_smoke.h"
+#include "GPU_compatibility.h"
+
/* UNUSED so far, may be enabled later */
/* #define USE_SMOKE_COLLISION_DM */
Modified: branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/subsurf_ccg.c 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/subsurf_ccg.c 2012-08-07 22:56:39 UTC (rev 49674)
@@ -67,6 +67,7 @@
#include "BLI_array.h"
#include "GPU_compatibility.h"
+#include "GPU_colors.h"
#include "GPU_draw.h"
#include "GPU_extensions.h"
#include "GPU_material.h"
Modified: branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_matrix.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_matrix.h 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_matrix.h 2012-08-07 22:56:39 UTC (rev 49674)
@@ -66,7 +66,7 @@
void sub_m3_m3m3(float R[3][3], float A[3][3], float B[3][3]);
void sub_m4_m4m4(float R[4][4], float A[4][4], float B[4][4]);
-void mult_m4_m4m4_q(float m1[4][4], float m3[4][4], float m2[4][4]);
+void mult_m4_m4m4_q(float m1[4][4], const float m3[4][4], const float m2[4][4]);
void mult_m4_m3m4_q(float m1[4][4], float m3[4][4], float m2[3][3]);
void mul_m3_m3m3(float R[3][3], float A[3][3], float B[3][3]);
@@ -86,7 +86,7 @@
void mul_m4_v3(float M[4][4], float r[3]);
void mul_v3_m4v3(float r[3], float M[4][4], const float v[3]);
-void mul_v4_m4v3(float r[4], float M[4][4], const float v[3]);
+void mul_v4_m4v3(float r[4], const float M[4][4], const float v[3]);
void mul_v3_m4v3_q(float r[3], float M[4][4], const float v[3]);
void mul_mat3_m4_v3(float M[4][4], float r[3]);
void mul_m4_v4(float M[4][4], float r[4]);
Modified: branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/math_matrix.c 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/math_matrix.c 2012-08-07 22:56:39 UTC (rev 49674)
@@ -142,7 +142,7 @@
/******************************** Arithmetic *********************************/
-void mult_m4_m4m4_q(float m1[][4], float m3[][4], float m2[][4])
+void mult_m4_m4m4_q(float m1[][4], const float m3[][4], const float m2[][4])
{
/* matrix product: m1[j][k] = m2[j][i].m3[i][k] */
m1[0][0] = m2[0][0] * m3[0][0] + m2[0][1] * m3[1][0] + m2[0][2] * m3[2][0] + m2[0][3] * m3[3][0];
@@ -365,7 +365,7 @@
}
-void mul_v4_m4v3(float out[4], float mat[][4], const float vec[3])
+void mul_v4_m4v3(float out[4], const float mat[][4], const float vec[3])
{
out[0] = vec[0] * mat[0][0] + vec[1] * mat[1][0] + mat[2][0] * vec[2] + mat[3][0];
out[1] = vec[0] * mat[0][1] + vec[1] * mat[1][1] + mat[2][1] * vec[2] + mat[3][1];
Modified: branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_channels_defines.c 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_channels_defines.c 2012-08-07 22:56:39 UTC (rev 49674)
@@ -70,7 +70,8 @@
#include "ED_anim_api.h"
#include "ED_keyframing.h"
-#include "GPU_compatibility.h"
+#include "GPU_colors.h"
+#include "GPU_primitives.h"
#include "WM_api.h"
#include "WM_types.h"
Modified: branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_draw.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_draw.c 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_draw.c 2012-08-07 22:56:39 UTC (rev 49674)
@@ -45,10 +45,9 @@
#include "RNA_access.h"
-#include "GPU_compatibility.h"
+#include "GPU_colors.h"
+#include "GPU_primitives.h"
-#include "BIF_gl.h"
-
#include "UI_interface.h"
#include "UI_resources.h"
#include "UI_view2d.h"
Modified: branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_markers.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_markers.c 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_markers.c 2012-08-07 22:56:39 UTC (rev 49674)
@@ -53,7 +53,6 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "BIF_gl.h"
#include "BIF_glutil.h"
#include "UI_interface.h"
@@ -70,7 +69,8 @@
#include "ED_transform.h"
#include "ED_types.h"
-#include "GPU_compatibility.h"
+#include "GPU_colors.h"
+#include "GPU_primitives.h"
/* ************* Marker API **************** */
Modified: branches/soc-2012-swiss_cheese/source/blender/editors/animation/keyframes_draw.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/animation/keyframes_draw.c 2012-08-07 19:49:38 UTC (rev 49673)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/animation/keyframes_draw.c 2012-08-07 22:56:39 UTC (rev 49674)
@@ -66,10 +66,9 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list