[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55252] trunk/blender/source/blender: fix for 2 errors where the 2d arrays were used as 3d.
Campbell Barton
ideasman42 at gmail.com
Wed Mar 13 19:10:05 CET 2013
Revision: 55252
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55252
Author: campbellbarton
Date: 2013-03-13 18:10:05 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
fix for 2 errors where the 2d arrays were used as 3d. (out of bounds read).
also minor code cleanup.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c 2013-03-13 18:00:13 UTC (rev 55251)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c 2013-03-13 18:10:05 UTC (rev 55252)
@@ -532,7 +532,7 @@
/* Get strength by feeding the vertex
* location directly into a texture */
hasrgb = externtex(mtex, point, &intensity,
- rgba, rgba + 1, rgba + 2, rgba + 3, 0, pool);
+ rgba, rgba + 1, rgba + 2, rgba + 3, 0, pool);
}
else {
float rotation = -mtex->rot;
@@ -587,7 +587,7 @@
co[2] = 0.0f;
hasrgb = externtex(mtex, co, &intensity,
- rgba, rgba + 1, rgba + 2, rgba + 3, 0, pool);
+ rgba, rgba + 1, rgba + 2, rgba + 3, 0, pool);
}
intensity += br->texture_sample_bias;
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c 2013-03-13 18:00:13 UTC (rev 55251)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c 2013-03-13 18:10:05 UTC (rev 55252)
@@ -3902,10 +3902,13 @@
sub_v2_v2v2(samplecos, projPixel->projCoSS, pos);
}
/* taking 3d copy to account for 3D mapping too. It gets concatenated during sampling */
- else if (mtex->brush_map_mode == MTEX_MAP_MODE_3D)
+ else if (mtex->brush_map_mode == MTEX_MAP_MODE_3D) {
copy_v3_v3(samplecos, projPixel->worldCoSS);
- else
- copy_v3_v3(samplecos, projPixel->projCoSS);
+ }
+ else {
+ copy_v2_v2(samplecos, projPixel->projCoSS);
+ samplecos[2] = 0.0f;
+ }
}
if (falloff > 0.0f) {
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2013-03-13 18:00:13 UTC (rev 55251)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2013-03-13 18:10:05 UTC (rev 55252)
@@ -973,7 +973,8 @@
avg += br->texture_sample_bias;
}
else {
- avg = BKE_brush_sample_tex_3D(scene, br, point_2d, rgba, ss->tex_pool);
+ const float point_3d[3] = {point_2d[0], point_2d[1], 0.0f};
+ avg = BKE_brush_sample_tex_3D(scene, br, point_3d, rgba, ss->tex_pool);
}
}
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2013-03-13 18:00:13 UTC (rev 55251)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2013-03-13 18:10:05 UTC (rev 55252)
@@ -145,7 +145,7 @@
ebone->flag |= flag;
}
else {
- ebone->flag &= ~flag;
+ ebone->flag &= ~flag;
}
}
}
@@ -160,7 +160,7 @@
bone->flag |= flag;
}
else {
- bone->flag &= ~flag;
+ bone->flag &= ~flag;
}
restrictbutton_recursive_bone(C, arm, bone, flag, set_flag);
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2013-03-13 18:00:13 UTC (rev 55251)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2013-03-13 18:10:05 UTC (rev 55252)
@@ -294,7 +294,7 @@
}
/* only meant for timer usage */
-static int view3d_smoothview_invoke(bContext *C, wmOperator *UNUSED(op), const const wmEvent *event)
+static int view3d_smoothview_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
{
View3D *v3d = CTX_wm_view3d(C);
RegionView3D *rv3d = CTX_wm_region_view3d(C);
Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2013-03-13 18:00:13 UTC (rev 55251)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2013-03-13 18:10:05 UTC (rev 55252)
@@ -1128,7 +1128,7 @@
fprintf(stderr, "%s\n", log);
}
-static const char *gpu_shader_standard_defines()
+static const char *gpu_shader_standard_defines(void)
{
/* some useful defines to detect GPU type */
if(GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_ANY, GPU_DRIVER_ANY))
More information about the Bf-blender-cvs
mailing list