dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2.5:

Browse Source 
* Fixed CMake includes for blenkernel
* Fixed an RNA property read that was causing failures in a couple paint modes
This commit is contained in:
Nicholas Bishop
2009-08-18 21:14:36 +00:00
parent 80cbcfed27
commit d96edd041e
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/blenkernel/CMakeLists.txt
+1 -1
View File
@@ -32,7 +32,7 @@ SET(INC
../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern
../../../intern/iksolver/extern ../blenloader
../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
../../../intern/bsp/extern
../../../intern/bsp/extern ../blenfont
../../../intern/audaspace/intern
${ZLIB_INC}
)
source/blender/editors/physics/editparticle.c
+6 -4
View File
@@ -3068,11 +3068,13 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
ParticleSystemModifierData *psmd= psys_get_modifier(ob, psys);
ParticleBrushData *brush= &pset->brush[pset->brushtype];
ARegion *ar= CTX_wm_region(C);
float vec1[3], vec2[3];
float vec1[3], vec2[3], mousef[2];
short mval[2], mvalo[2];
int flip, mouse[2], dx, dy, removed= 0, selected= 0;
RNA_int_get_array(itemptr, "mouse", mouse);
RNA_float_get_array(itemptr, "mouse", mousef);
mouse[0] = mousef[0];
mouse[1] = mousef[1];
flip= RNA_boolean_get(itemptr, "flip");
if(bedit->first) {
@@ -3283,7 +3285,7 @@ static void brush_edit_apply_event(bContext *C, wmOperator *op, wmEvent *event)
{
ARegion *ar= CTX_wm_region(C);
PointerRNA itemptr;
int mouse[2];
float mouse[2];
mouse[0]= event->x - ar->winrct.xmin;
mouse[1]= event->y - ar->winrct.ymin;
@@ -3291,7 +3293,7 @@ static void brush_edit_apply_event(bContext *C, wmOperator *op, wmEvent *event)
/* fill in stroke */
RNA_collection_add(op->ptr, "stroke", &itemptr);
RNA_int_set_array(&itemptr, "mouse", mouse);
RNA_float_set_array(&itemptr, "mouse", mouse);
RNA_boolean_set(&itemptr, "flip", event->shift != 0); // XXX hardcoded
/* apply */
source/blender/editors/sculpt_paint/paint_image.c
+8 -4
View File
@@ -4612,11 +4612,13 @@ static int texture_paint_init(bContext *C, wmOperator *op)
static void paint_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
{
PaintOperation *pop= op->customdata;
float time;
float time, mousef[2];
float pressure;
int mouse[2], redraw;
RNA_int_get_array(itemptr, "mouse", mouse);
RNA_float_get_array(itemptr, "mouse", mousef);
mouse[0] = mousef[0];
mouse[1] = mousef[1];
time= RNA_float_get(itemptr, "time");
pressure= RNA_float_get(itemptr, "pressure");
@@ -4696,7 +4698,7 @@ static void paint_apply_event(bContext *C, wmOperator *op, wmEvent *event)
PaintOperation *pop= op->customdata;
wmTabletData *wmtab;
PointerRNA itemptr;
float pressure;
float pressure, mousef[2];
double time;
int tablet, mouse[2];
@@ -4737,7 +4739,9 @@ static void paint_apply_event(bContext *C, wmOperator *op, wmEvent *event)
/* fill in stroke */
RNA_collection_add(op->ptr, "stroke", &itemptr);
RNA_int_set_array(&itemptr, "mouse", mouse);
mousef[0] = mouse[0];
mousef[1] = mouse[1];
RNA_float_set_array(&itemptr, "mouse", mousef);
RNA_float_set(&itemptr, "time", (float)(time - pop->starttime));
RNA_float_set(&itemptr, "pressure", pressure);