[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37791] branches/soc-2011-onion/source/ blender: Compile fixes, nothing new yet
Antony Riakiotakis
kalast at gmail.com
Fri Jun 24 15:27:52 CEST 2011
Revision: 37791
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37791
Author: psy-fi
Date: 2011-06-24 13:27:51 +0000 (Fri, 24 Jun 2011)
Log Message:
-----------
Compile fixes, nothing new yet
Modified Paths:
--------------
branches/soc-2011-onion/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_files.c
Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/sculpt.c 2011-06-24 12:54:52 UTC (rev 37790)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/sculpt.c 2011-06-24 13:27:51 UTC (rev 37791)
@@ -99,7 +99,7 @@
static void calc_sculpt_normal(const Sculpt *sd, const Object *ob, float an[3], PBVHNode **nodes, int totnode, float range);
static void sculpt_flush_pbvhvert_deform(Object *ob, PBVHVertexIter *vd);
-void ED_sculpt_force_update(bContext *C)
+void ED_paint_mesh_force_update(bContext *C)
{
Object *ob= CTX_data_active_object(C);
@@ -4248,7 +4248,7 @@
bglMats mats;
BoundBox bb;
rcti rect;
- HiddenArea *area;
+ PBVHHiddenArea *area;
memset(&mats, 0, sizeof(bglMats));
rect.xmin= RNA_int_get(op->ptr, "xmin");
@@ -4256,7 +4256,7 @@
rect.xmax= RNA_int_get(op->ptr, "xmax");
rect.ymax= RNA_int_get(op->ptr, "ymax");
- area = MEM_callocN(sizeof(HiddenArea), "hidden_area");
+ area = MEM_callocN(sizeof(PBVHHiddenArea), "hidden_area");
area->hide_inside = RNA_boolean_get(op->ptr, "hide_inside");
view3d_operator_needs_opengl(C);
Modified: branches/soc-2011-onion/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/soc-2011-onion/source/blender/windowmanager/intern/wm_files.c 2011-06-24 12:54:52 UTC (rev 37790)
+++ branches/soc-2011-onion/source/blender/windowmanager/intern/wm_files.c 2011-06-24 13:27:51 UTC (rev 37791)
@@ -723,7 +723,7 @@
}
ED_object_exit_editmode(C, EM_DO_UNDO);
- ED_sculpt_force_update(C);
+ ED_paint_mesh_force_update(C);
/* don't forget not to return without! */
WM_cursor_wait(1);
More information about the Bf-blender-cvs
mailing list