[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55237] trunk/blender/source/blender: Fix write past end of array in recent texture sampling refactoring commit, and
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed Mar 13 15:19:55 CET 2013
Revision: 55237
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55237
Author: blendix
Date: 2013-03-13 14:19:55 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
Fix write past end of array in recent texture sampling refactoring commit, and
a small warning for double const keyword.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c 2013-03-13 14:19:53 UTC (rev 55236)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c 2013-03-13 14:19:55 UTC (rev 55237)
@@ -539,7 +539,7 @@
float point_2d[2] = {point[0], point[1]};
float x = 0.0f, y = 0.0f; /* Quite warnings */
float radius = 1.0f; /* Quite warnings */
- float co[2];
+ float co[3];
if (mtex->brush_map_mode == MTEX_MAP_MODE_VIEW) {
/* keep coordinates relative to mouse */
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_select.c 2013-03-13 14:19:53 UTC (rev 55236)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c 2013-03-13 14:19:55 UTC (rev 55237)
@@ -2229,7 +2229,7 @@
/* ****** Mouse Select ****** */
-static int view3d_select_invoke(bContext *C, wmOperator *op, const const wmEvent *event)
+static int view3d_select_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
Object *obedit = CTX_data_edit_object(C);
Object *obact = CTX_data_active_object(C);
More information about the Bf-blender-cvs
mailing list