[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23202] trunk/blender/source/blender: remove doubles uses an operator property for the merge distance.
Revision: 23202
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23202
Author: joeedh
Date: 2009-09-14 08:06:01 +0200 (Mon, 14 Sep 2009)
Log Message:
---
remove doubles uses an operator property for the merge distance. it no longer
reports number of merged verts to the user, as this violates operator
nonmodality and messes up last operator panel workflow.
Modified Paths:
--
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/mesh_ops.c
trunk/blender/source/blender/makesdna/DNA_modifier_types.h
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2009-09-14
05:00:03 UTC (rev 23201)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2009-09-14
06:06:01 UTC (rev 23202)
@@ -486,13 +486,14 @@
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit-data));
char msg[100];
- int cnt = removedoublesflag(em,1,0,ts-doublimit);
+ int cnt = removedoublesflag(em,1,0,RNA_float_get(op-ptr, limit));
+ /*XXX this messes up last operator panel
if(cnt)
{
sprintf(msg, Removed %d vertices, cnt);
BKE_report(op-reports, RPT_INFO, msg);
- }
+ }*/
DAG_id_flush_update(obedit-data, OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit-data);
@@ -514,6 +515,8 @@
/* flags */
ot-flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+ RNA_def_float(ot-srna, limit, 0.1f, 0.01f, 50.0f, Merge
Threshold, Minimum distance between merged verts, 0.1f, 10.0f);
}
// XXX is this needed?
Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c
===
--- trunk/blender/source/blender/editors/mesh/mesh_ops.c2009-09-14
05:00:03 UTC (rev 23201)
+++ trunk/blender/source/blender/editors/mesh/mesh_ops.c2009-09-14
06:06:01 UTC (rev 23202)
@@ -335,6 +335,12 @@
WM_operatortype_macro_define(ot, MESH_OT_extrude);
WM_operatortype_macro_define(ot, TFM_OT_translate);
+ /*combining operators with invoke and exec portions doesn't work yet.
+
+ ot= WM_operatortype_append_macro(MESH_OT_loopcut, Loopcut,
OPTYPE_UNDO|OPTYPE_REGISTER);
+ WM_operatortype_macro_define(ot, MESH_OT_edgering_select);
+ WM_operatortype_macro_define(ot, MESH_OT_subdivide);
+ */
}
/* note mesh keymap also for other space? */
@@ -343,6 +349,8 @@
ListBase *keymap= WM_keymap_listbase(wm, EditMesh, 0, 0);
wmKeymapItem *kmi;
+ //WM_keymap_add_item(keymap, MESH_OT_loopcut, RKEY, KM_PRESS,
KM_CTRL, 0);
+
/* selecting */
/* standard mouse selection goes via space_view3d */
WM_keymap_add_item(keymap, MESH_OT_loop_select, SELECTMOUSE,
KM_PRESS, KM_ALT, 0);
@@ -354,7 +362,7 @@
RNA_boolean_set(kmi-ptr, extend, 1);
WM_keymap_add_item(keymap, MESH_OT_select_shortest_path, SELECTMOUSE,
KM_PRESS, KM_CTRL, 0);
-
+
WM_keymap_add_item(keymap, MESH_OT_select_all_toggle, AKEY, KM_PRESS,
0, 0);
WM_keymap_add_item(keymap, MESH_OT_select_more, PADPLUSKEY, KM_PRESS,
KM_CTRL, 0);
WM_keymap_add_item(keymap, MESH_OT_select_less, PADMINUS, KM_PRESS,
KM_CTRL, 0);
Modified: trunk/blender/source/blender/makesdna/DNA_modifier_types.h
===
--- trunk/blender/source/blender/makesdna/DNA_modifier_types.h 2009-09-14
05:00:03 UTC (rev 23201)
+++ trunk/blender/source/blender/makesdna/DNA_modifier_types.h 2009-09-14
06:06:01 UTC (rev 23202)
@@ -471,7 +471,6 @@
#define MOD_MDEF_INVERT_VGROUP (10)
#define MOD_MDEF_DYNAMIC_BIND (11)
-#define MOD_MDEF_USE_FINAL (12)
typedef struct MDefInfluence {
int vertex;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23203] trunk/blender/release/ui/ buttons_object.py: * boundbox display option was missing from object properties
Revision: 23203 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23203 Author: broken Date: 2009-09-14 08:31:20 +0200 (Mon, 14 Sep 2009) Log Message: --- * boundbox display option was missing from object properties Modified Paths: -- trunk/blender/release/ui/buttons_object.py Modified: trunk/blender/release/ui/buttons_object.py === --- trunk/blender/release/ui/buttons_object.py 2009-09-14 06:06:01 UTC (rev 23202) +++ trunk/blender/release/ui/buttons_object.py 2009-09-14 06:31:20 UTC (rev 23203) @@ -92,10 +92,14 @@ layout = self.layout ob = context.object - - row = layout.row() - row.itemR(ob, max_draw_type, text=Type) - row.itemR(ob, draw_bounds_type, text=Bounds) + + split = layout.split() + col = split.column() + col.itemR(ob, max_draw_type, text=Type) + col = split.column() + row = col.row() + row.itemR(ob, draw_bounds, text=Bounds) + row.itemR(ob, draw_bounds_type, text=) flow = layout.column_flow() flow.itemR(ob, draw_name, text=Name) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23204] trunk/blender/source/blender/ editors/transform/transform_ops.c: to sphere transform hotkey is now alt-shift-s, since ctrl-shift-s was taken b
Revision: 23204 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23204 Author: joeedh Date: 2009-09-14 08:59:37 +0200 (Mon, 14 Sep 2009) Log Message: --- to sphere transform hotkey is now alt-shift-s, since ctrl-shift-s was taken by save as. Modified Paths: -- trunk/blender/source/blender/editors/transform/transform_ops.c Modified: trunk/blender/source/blender/editors/transform/transform_ops.c === --- trunk/blender/source/blender/editors/transform/transform_ops.c 2009-09-14 06:31:20 UTC (rev 23203) +++ trunk/blender/source/blender/editors/transform/transform_ops.c 2009-09-14 06:59:37 UTC (rev 23204) @@ -641,7 +641,7 @@ km = WM_keymap_add_item(keymap, TFM_OT_warp, WKEY, KM_PRESS, KM_SHIFT, 0); - km = WM_keymap_add_item(keymap, TFM_OT_tosphere, SKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0); + km = WM_keymap_add_item(keymap, TFM_OT_tosphere, SKEY, KM_PRESS, KM_ALT|KM_SHIFT, 0); km = WM_keymap_add_item(keymap, TFM_OT_shear, SKEY, KM_PRESS, KM_ALT|KM_CTRL|KM_SHIFT, 0); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23205] trunk/blender/source/blender/ editors/mesh/mesh_ops.c: knife 'mode' is now leftclick with ctrl-x held down, instead of ctrl-alt
Revision: 23205 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23205 Author: joeedh Date: 2009-09-14 09:33:00 +0200 (Mon, 14 Sep 2009) Log Message: --- knife 'mode' is now leftclick with ctrl-x held down, instead of ctrl-alt Modified Paths: -- trunk/blender/source/blender/editors/mesh/mesh_ops.c Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c === --- trunk/blender/source/blender/editors/mesh/mesh_ops.c2009-09-14 06:59:37 UTC (rev 23204) +++ trunk/blender/source/blender/editors/mesh/mesh_ops.c2009-09-14 07:33:00 UTC (rev 23205) @@ -431,7 +431,7 @@ WM_keymap_add_item(keymap, MESH_OT_fgon_make, FKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, MESH_OT_fgon_clear, FKEY, KM_PRESS, KM_SHIFT|KM_ALT, 0); - WM_keymap_add_item(keymap, MESH_OT_knife_cut, LEFTMOUSE, KM_PRESS, KM_ALT|KM_CTRL, 0); + WM_keymap_add_item(keymap, MESH_OT_knife_cut, LEFTMOUSE, KM_PRESS, KM_CTRL, XKEY); /* menus */ WM_keymap_add_item(keymap, MESH_OT_vertex_specials, VKEY, KM_PRESS, KM_CTRL, 0); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23206] trunk/blender/source/blender/ editors/datafiles/B.blend.c: updated .b.blend; show toolbar by default now, made the view3d clip start saner, an
Revision: 23206
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23206
Author: joeedh
Date: 2009-09-14 10:38:04 +0200 (Mon, 14 Sep 2009)
Log Message:
---
updated .b.blend; show toolbar by default now, made the view3d clip start
saner, and turend on grab manipulator
Modified Paths:
--
trunk/blender/source/blender/editors/datafiles/B.blend.c
Modified: trunk/blender/source/blender/editors/datafiles/B.blend.c
===
--- trunk/blender/source/blender/editors/datafiles/B.blend.c2009-09-14
07:33:00 UTC (rev 23205)
+++ trunk/blender/source/blender/editors/datafiles/B.blend.c2009-09-14
08:38:04 UTC (rev 23206)
@@ -1,821 +1,880 @@
/* DataToC output of file B_blend */
-int datatoc_B_blend_size= 94308;
+int datatoc_B_blend_size= 100360;
char datatoc_B_blend[]= {
- 66, 76, 69, 78,
- 68, 69, 82, 45,118, 50, 53, 48, 82, 69, 78, 68, 32, 0, 0, 0,
80,187,118,198,255,127, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
- 1, 0, 0, 0,250, 0, 0, 0, 83, 99,101,110,101, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 71, 76, 79, 66, 40, 0, 0, 0, 64,187,118,198,255,127, 0, 0,185, 0, 0,
0, 1, 0, 0, 0, 32, 32, 32, 48, 0, 0, 0, 0,
-250, 0, 0, 0, 1, 0, 0, 1,208,233, 90, 2, 0, 0, 0, 0, 96,130, 91,
2, 0, 0, 0, 0, 0, 16, 0, 0,128, 32, 4, 0,
- 87, 77, 0, 0,224, 0, 0, 0,144,231, 90, 2, 0, 0, 0, 0, 75, 1, 0,
0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 87, 77, 87,105,110, 77, 97,110,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 32,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-176,232, 90, 2, 0, 0, 0, 0,176,232, 90, 2, 0, 0, 0, 0,176,232, 90,
2, 0, 0, 0, 0,176,232, 90, 2, 0, 0, 0, 0,
- 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0,
- 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,144,131,100, 2, 0, 0, 0, 0,176,167,177,
2, 0, 0, 0, 0, 68, 65, 84, 65,224, 0, 0, 0,
-176,232, 90, 2, 0, 0, 0, 0, 76, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-224,186, 91, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,208,233, 90,
2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-115, 99,114,101,101,110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 5, 0, 30, 0,118, 7, 97, 4, 0, 0, 0, 0, 1, 0,238, 3, 0, 0, 1,
0, 0, 0, 0, 0, 0,131,100, 2, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0,240, 14,119, 2, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,224,224,180,
2, 0, 0, 0, 0,224,224,180, 2, 0, 0, 0, 0,
- 64,132,100, 2, 0, 0, 0, 0,176,133,100, 2, 0, 0, 0, 0,112,134,100,
2, 0, 0, 0, 0,144,191,100, 2, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 83, 78, 0,
0,208, 0, 0, 0,208,233, 90, 2, 0, 0, 0, 0,
-179, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 83, 82, 83, 99,114,101,101,110, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,224,234, 90,
2, 0, 0, 0, 0,192,239, 90, 2, 0, 0, 0, 0,
- 32,240, 90, 2, 0, 0, 0, 0,144,247, 90, 2, 0, 0, 0, 0, 0,248, 90,
2, 0, 0, 0, 0,160,111, 91, 2, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 96,130, 91,
2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 8,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 80,149,150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,
-224,234, 90, 2, 0, 0, 0, 0,180, 0, 0, 0, 1, 0, 0, 0, 64,235, 90,
2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 65, 84,
65, 32, 0, 0, 0, 64,235, 90, 2, 0, 0, 0, 0,
-180, 0, 0, 0, 1, 0, 0, 0,160,235, 90, 2, 0, 0, 0, 0,224,234, 90,
2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 97, 4, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,160,235, 90,
2, 0, 0, 0, 0,180, 0, 0, 0, 1, 0, 0, 0,
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23207] trunk/blender: Three node selection operators added, patch by Micha?\197?\130 Ziu?\197? \130ek, thanks!
Revision: 23207
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23207
Author: blendix
Date: 2009-09-14 10:47:13 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Three node selection operators added, patch by Micha?\197?\130 Ziu?\197?\130ek,
thanks!
* Select all
* Select linked to
* Select linked from
Modified Paths:
--
trunk/blender/release/ui/space_node.py
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_intern.h
trunk/blender/source/blender/editors/space_node/node_ops.c
trunk/blender/source/blender/editors/space_node/node_select.c
Modified: trunk/blender/release/ui/space_node.py
===
--- trunk/blender/release/ui/space_node.py 2009-09-14 08:38:04 UTC (rev
23206)
+++ trunk/blender/release/ui/space_node.py 2009-09-14 08:47:13 UTC (rev
23207)
@@ -74,11 +74,10 @@
layout.itemO(node.select_border)
- # XXX
- # layout.itemS()
- # layout.itemO(node.select_all)
- # layout.itemO(node.select_linked_from)
- # layout.itemO(node.select_linked_to)
+ layout.itemS()
+ layout.itemO(node.select_all)
+ layout.itemO(node.select_linked_from)
+ layout.itemO(node.select_linked_to)
class NODE_MT_node(bpy.types.Menu):
__space_type__ = 'NODE_EDITOR'
Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===
--- trunk/blender/source/blender/editors/space_node/node_edit.c 2009-09-14
08:38:04 UTC (rev 23206)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c 2009-09-14
08:47:13 UTC (rev 23207)
@@ -1229,27 +1229,14 @@
/* no undo here! */
-void node_deselectall(SpaceNode *snode, int swap)
+void node_deselectall(SpaceNode *snode)
{
bNode *node;
- if(swap) {
- for(node= snode-edittree-nodes.first; node; node= node-next)
- if(node-flag SELECT)
- break;
- if(node==NULL) {
- for(node= snode-edittree-nodes.first; node; node=
node-next)
- node-flag |= SELECT;
- return;
- }
- /* else pass on to deselect */
- }
-
for(node= snode-edittree-nodes.first; node; node= node-next)
node-flag = ~SELECT;
}
-
int node_has_hidden_sockets(bNode *node)
{
bNodeSocket *sock;
@@ -1606,7 +1593,7 @@
{
bNode *node= NULL, *gnode;
- node_deselectall(snode, 0);
+ node_deselectall(snode);
if(type=NODE_DYNAMIC_MENU) {
node= nodeAddNodeType(snode-edittree, type, NULL, NULL);
@@ -2091,32 +2078,6 @@
}
}
-void node_select_linked(SpaceNode *snode, int out)
-{
- bNodeLink *link;
- bNode *node;
-
- /* NODE_TEST is the free flag */
- for(node= snode-edittree-nodes.first; node; node= node-next)
- node-flag = ~NODE_TEST;
-
- for(link= snode-edittree-links.first; link; link= link-next) {
- if(out) {
- if(link-fromnode-flag NODE_SELECT)
- link-tonode-flag |= NODE_TEST;
- }
- else {
- if(link-tonode-flag NODE_SELECT)
- link-fromnode-flag |= NODE_TEST;
- }
- }
-
- for(node= snode-edittree-nodes.first; node; node= node-next)
- if(node-flag NODE_TEST)
- node-flag |= NODE_SELECT;
-
-}
-
/* makes a link between selected output and input sockets */
void node_make_link(SpaceNode *snode)
{
@@ -2451,9 +2412,6 @@
if(fromlib) fromlib= -1;
else toolbox_n_add();
}
- else if(G.qual==0) {
- node_deselectall(snode, 1);
- }
break;
case BKEY:
if(G.qual==0)
Modified: trunk/blender/source/blender/editors/space_node/node_intern.h
===
--- trunk/blender/source/blender/editors/space_node/node_intern.h
2009-09-14 08:38:04 UTC (rev 23206)
+++ trunk/blender/source/blender/editors/space_node/node_intern.h
2009-09-14 08:47:13 UTC (rev 23207)
@@ -58,6 +58,9 @@
/* node_select.c */
void NODE_OT_select(struct wmOperatorType *ot);
void NODE_OT_select_extend(struct wmOperatorType *ot);
+void NODE_OT_select_all(wmOperatorType *ot);
+void NODE_OT_select_linked_to(wmOperatorType *ot);
+void NODE_OT_select_linked_from(wmOperatorType *ot);
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23208] trunk/blender/source/blender/ blenkernel/intern/smoke.c: Smoke:
Revision: 23208 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23208 Author: genscher Date: 2009-09-14 12:21:41 +0200 (Mon, 14 Sep 2009) Log Message: --- Smoke: * Bugifx for no shadow on startframe when loaded from cache Modified Paths: -- trunk/blender/source/blender/blenkernel/intern/smoke.c Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c === --- trunk/blender/source/blender/blenkernel/intern/smoke.c 2009-09-14 08:47:13 UTC (rev 23207) +++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2009-09-14 10:21:41 UTC (rev 23208) @@ -1179,6 +1179,11 @@ // simulate the actual smoke (c++ code in intern/smoke) if(framenr!=startframe) smoke_step(sds-fluid, smd-time); + + // create shadows before writing cache so we get nice shadows for sstartframe, too + if(get_lamp(scene, light)) + smoke_calc_transparency(sds-shadow, smoke_get_density(sds-fluid), sds-p0, sds-p1, sds-res, sds-dx, light, calc_voxel_transp, -7.0*sds-dx); + BKE_ptcache_write_cache(pid, framenr); if(sds-wt) @@ -1191,9 +1196,6 @@ BKE_ptcache_write_cache(pid_wt, framenr); } - if(get_lamp(scene, light)) - smoke_calc_transparency(sds-shadow, smoke_get_density(sds-fluid), sds-p0, sds-p1, sds-res, sds-dx, light, calc_voxel_transp, -7.0*sds-dx); - tend(); printf ( Frame: %d, Time: %f\n, (int)smd-time, ( float ) tval() ); } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23209] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Smoke:
Revision: 23209
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23209
Author: genscher
Date: 2009-09-14 12:37:13 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Smoke:
* put another drawing method in to test for broken
Modified Paths:
--
trunk/blender/source/blender/editors/space_view3d/drawobject.c
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c
2009-09-14 10:21:41 UTC (rev 23208)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c
2009-09-14 10:37:13 UTC (rev 23209)
@@ -5360,12 +5360,57 @@
{
if(!smd-domain-wt || !(smd-domain-viewsettings
MOD_SMOKE_VIEW_SHOWBIG))
{
+// #if0
smd-domain-tex = NULL;
GPU_create_smoke(smd, 0);
draw_volume(scene, ar, v3d, base,
smd-domain-tex, smd-domain-p0, smd-domain-p1, smd-domain-res,
smd-domain-dx, smd-domain-tex_shadow);
GPU_free_smoke(smd);
+// #endif
+#if 0
+ int x, y, z;
+ float *density =
smoke_get_density(smd-domain-fluid);
+
+ wmLoadMatrix(rv3d-viewmat);
+ // wmMultMatrix(ob-obmat);
+
+ if(col || (ob-flag SELECT)) cpack(0xFF);
+ glDepthMask(GL_FALSE);
+ glEnable(GL_BLEND);
+
+
+ // glPointSize(3.0);
+ bglBegin(GL_POINTS);
+
+ for(x = 0; x smd-domain-res[0]; x++)
+ for(y = 0; y smd-domain-res[1]; y++)
+ for(z = 0; z
smd-domain-res[2]; z++)
+ {
+ float tmp[3];
+ int index = smoke_get_index(x,
smd-domain-res[0], y, smd-domain-res[1], z);
+
+ if(density[index] FLT_EPSILON)
+ {
+ float color[3];
+ VECCOPY(tmp, smd-domain-p0);
+ tmp[0] += smd-domain-dx * x +
smd-domain-dx * 0.5;
+ tmp[1] += smd-domain-dx * y +
smd-domain-dx * 0.5;
+ tmp[2] += smd-domain-dx * z +
smd-domain-dx * 0.5;
+ color[0] = color[1] = color[2]
= 1.0; // density[index];
+ glColor3fv(color);
+ bglVertex3fv(tmp);
+ }
+ }
+
+ bglEnd();
+ glPointSize(1.0);
+
+ wmMultMatrix(ob-obmat);
+ glDisable(GL_BLEND);
+ glDepthMask(GL_TRUE);
+ if(col) cpack(col);
+#endif
}
- else if(smd-domain-wt || (smd-domain-viewsettings
MOD_SMOKE_VIEW_SHOWBIG))
+ else if(smd-domain-wt (smd-domain-viewsettings
MOD_SMOKE_VIEW_SHOWBIG))
{
smd-domain-tex = NULL;
GPU_create_smoke(smd, 1);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23210] branches/soc-2009-imbusy: Added a checkbox in the user preferences for turning off VBO support
Revision: 23210
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23210
Author: imbusy
Date: 2009-09-14 12:53:39 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Added a checkbox in the user preferences for turning off VBO support
Modified Paths:
--
branches/soc-2009-imbusy/release/ui/space_userpref.py
branches/soc-2009-imbusy/source/blender/gpu/gpu_buffers.h
branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2009-imbusy/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_userdef.c
Modified: branches/soc-2009-imbusy/release/ui/space_userpref.py
===
--- branches/soc-2009-imbusy/release/ui/space_userpref.py 2009-09-14
10:37:13 UTC (rev 23209)
+++ branches/soc-2009-imbusy/release/ui/space_userpref.py 2009-09-14
10:53:39 UTC (rev 23210)
@@ -306,6 +306,7 @@
sub1.itemL(text=OpenGL:)
sub1.itemR(system, clip_alpha, slider=True)
sub1.itemR(system, use_mipmaps)
+ sub1.itemR(system, use_vbos)
sub1.itemL(text=Window Draw Method:)
sub1.row().itemR(system, window_draw_method, expand=True)
sub1.itemL(text=Textures:)
Modified: branches/soc-2009-imbusy/source/blender/gpu/gpu_buffers.h
===
--- branches/soc-2009-imbusy/source/blender/gpu/gpu_buffers.h 2009-09-14
10:37:13 UTC (rev 23209)
+++ branches/soc-2009-imbusy/source/blender/gpu/gpu_buffers.h 2009-09-14
10:53:39 UTC (rev 23210)
@@ -36,7 +36,8 @@
#define MAX_FREE_GPU_BUFFERS 8
#ifdef _DEBUG
-#define DEBUG_VBO(X) printf(X)
+/*#define DEBUG_VBO(X) printf(X)*/
+#define DEBUG_VBO(X)
#else
#define DEBUG_VBO(X)
#endif
Modified: branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_buffers.c
===
--- branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_buffers.c
2009-09-14 10:37:13 UTC (rev 23209)
+++ branches/soc-2009-imbusy/source/blender/gpu/intern/gpu_buffers.c
2009-09-14 10:53:39 UTC (rev 23210)
@@ -34,6 +34,8 @@
#include GL/glew.h
+#include DNA_userdef_types.h
+
#include gpu_buffers.h
#include MEM_guardedalloc.h
#include BKE_DerivedMesh.h
@@ -1166,6 +1168,10 @@
int GPU_buffer_legacy( DerivedMesh *dm )
{
+ int test= (U.gameflags USER_DISABLE_VBO);
+ if( test )
+ return 1;
+
if( dm-drawObject == 0 )
dm-drawObject = GPU_drawobject_new(dm);
return dm-drawObject-legacy;
Modified: branches/soc-2009-imbusy/source/blender/makesdna/DNA_userdef_types.h
===
--- branches/soc-2009-imbusy/source/blender/makesdna/DNA_userdef_types.h
2009-09-14 10:37:13 UTC (rev 23209)
+++ branches/soc-2009-imbusy/source/blender/makesdna/DNA_userdef_types.h
2009-09-14 10:53:39 UTC (rev 23210)
@@ -446,6 +446,7 @@
#define USER_DEPRECATED_FLAG 1
#define USER_DISABLE_SOUND 2
#define USER_DISABLE_MIPMAP4
+#define USER_DISABLE_VBO 8
/* wm draw method */
#define USER_DRAW_TRIPLE 0
Modified: branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_userdef.c
===
--- branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_userdef.c
2009-09-14 10:37:13 UTC (rev 23209)
+++ branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_userdef.c
2009-09-14 10:53:39 UTC (rev 23210)
@@ -2143,6 +2143,10 @@
RNA_def_property_boolean_negative_sdna(prop, NULL, gameflags,
USER_DISABLE_MIPMAP);
RNA_def_property_ui_text(prop, Mipmaps, Scale textures for the 3d
View (looks nicer but uses more memory and slows image reloading.));
+ prop= RNA_def_property(srna, use_vbos, PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_negative_sdna(prop, NULL, gameflags,
USER_DISABLE_VBO);
+ RNA_def_property_ui_text(prop, VBOs, Use Vertex Buffer Objects (or
Vertex Arrays, if unsupported) for viewport rendering.);
+
prop= RNA_def_property(srna, gl_texture_limit, PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, glreslimit);
RNA_def_property_enum_items(prop, gl_texture_clamp_items);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23211] trunk/blender/source/blender: Bugfixes:
Revision: 23211
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23211
Author: aligorith
Date: 2009-09-14 12:56:40 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Bugfixes:
* #19338: Crash when using Convert operator
Uninitialised var (basact)
* Spacebar when in 3D-View EditMode for Text gets overridden by Search Menu.
I've tried adding a fix there, but it doesn't seem to work. Woraround for now
is shift-space for entering text.
* Fixed some compiled warnings in wm_operators.c about naming of var named
'main'
Modified Paths:
--
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/editors/object/object_add.c
===
--- trunk/blender/source/blender/editors/object/object_add.c2009-09-14
10:53:39 UTC (rev 23210)
+++ trunk/blender/source/blender/editors/object/object_add.c2009-09-14
10:56:40 UTC (rev 23211)
@@ -885,7 +885,7 @@
static int convert_exec(bContext *C, wmOperator *op)
{
Scene *scene= CTX_data_scene(C);
- Base *basen=NULL, *basact, *basedel=NULL;
+ Base *basen=NULL, *basact=NULL, *basedel=NULL;
Object *ob, *ob1, *obact= CTX_data_active_object(C);
DerivedMesh *dm;
Curve *cu;
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2009-09-14 10:53:39 UTC (rev 23210)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2009-09-14 10:56:40 UTC (rev 23211)
@@ -34,6 +34,7 @@
#include stdio.h
#include DNA_ID.h
+#include DNA_object_types.h
#include DNA_screen_types.h
#include DNA_scene_types.h
#include DNA_userdef_types.h
@@ -751,6 +752,7 @@
if(CTX_wm_window(C)==NULL) return 0;
if(CTX_wm_area(C) CTX_wm_area(C)-spacetype==SPACE_CONSOLE) return
0; // XXX - so we can use the shortcut in the console
if(CTX_wm_area(C) CTX_wm_area(C)-spacetype==SPACE_TEXT) return 0;
// XXX - so we can use the spacebar in the text editor
+ if(CTX_data_edit_object(C) CTX_data_edit_object(C)-type==OB_CURVE)
return 0; // XXX - so we can use the spacebar for entering text
return 1;
}
@@ -996,11 +998,10 @@
char name[FILE_MAX], dir[FILE_MAX], libname[FILE_MAX], group[GROUP_MAX];
int idcode;
BlendHandle *bh;
- struct Main *main= CTX_data_main(C);
+ struct Main *mainvar= CTX_data_main(C);
struct Scene *scene= CTX_data_scene(C);
struct Main *mainl= 0;
- struct ScrArea *sa= CTX_wm_area(C);
PropertyRNA *prop;
int totfiles=0;
short flag;
@@ -1015,7 +1016,7 @@
} else if (group[0]==0) {
BKE_report(op-reports, RPT_ERROR, Nothing indicated);
return OPERATOR_FINISHED;
- } else if (BLI_streq(main-name, libname)) {
+ } else if (BLI_streq(mainvar-name, libname)) {
BKE_report(op-reports, RPT_ERROR, Cannot use current file as
library);
return OPERATOR_FINISHED;
}
@@ -1063,11 +1064,11 @@
BLO_library_append_end(C, mainl, bh, idcode, flag);
/* DISPLISTS? */
- recalc_all_library_objects(main);
+ recalc_all_library_objects(mainvar);
/* Append, rather than linking */
if ((flag FILE_LINK)==0) {
- make_library_local(libname, main);
+ make_library_local(libname, mainvar);
}
/* do we need to do this? */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23212] trunk/blender/source/blender/ editors/mesh/editmesh_loop.c: Bugfix #19337: Crash when tweaking knife operator
Revision: 23212
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23212
Author: aligorith
Date: 2009-09-14 13:12:44 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Bugfix #19337: Crash when tweaking knife operator
Knife operator now doesn't crash, but repeat operator for this won't work now
since the appropriate 3D-View context info is not set when the mouse is in the
Tools region (i.e. when using repeat operator in the tools panels).
Modified Paths:
--
trunk/blender/source/blender/editors/mesh/editmesh_loop.c
Modified: trunk/blender/source/blender/editors/mesh/editmesh_loop.c
===
--- trunk/blender/source/blender/editors/mesh/editmesh_loop.c 2009-09-14
10:56:40 UTC (rev 23211)
+++ trunk/blender/source/blender/editors/mesh/editmesh_loop.c 2009-09-14
11:12:44 UTC (rev 23212)
@@ -60,6 +60,7 @@
#include BKE_library.h
#include BKE_mesh.h
#include BKE_object.h
+#include BKE_report.h
#include BKE_utildefines.h
#include PIL_time.h
@@ -637,6 +638,10 @@
int len=0;
short numcuts=1, mode= RNA_int_get(op-ptr, type);
+ /* edit-object needed for matrix, and ar-regiondata for projections to
work */
+ if (ELEM3(NULL, obedit, ar, ar-regiondata))
+ return OPERATOR_CANCELLED;
+
if (EM_nvertices_selected(em) 2) {
error(No edges are selected to operate on);
BKE_mesh_end_editmesh(obedit-data, em);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23213] trunk/blender/source/blender/ editors/interface/interface_layout.c: * Fix for typo in icon_only commit, causing RNA property buttons text to b
Revision: 23213 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23213 Author: broken Date: 2009-09-14 13:25:33 +0200 (Mon, 14 Sep 2009) Log Message: --- * Fix for typo in icon_only commit, causing RNA property buttons text to be doubled up brecht: I think this is right now...? :) Modified Paths: -- trunk/blender/source/blender/editors/interface/interface_layout.c Modified: trunk/blender/source/blender/editors/interface/interface_layout.c === --- trunk/blender/source/blender/editors/interface/interface_layout.c 2009-09-14 11:12:44 UTC (rev 23212) +++ trunk/blender/source/blender/editors/interface/interface_layout.c 2009-09-14 11:25:33 UTC (rev 23213) @@ -506,7 +506,7 @@ but= uiDefIconButO(block, BUT, BUTTONS_OT_file_browse, WM_OP_INVOKE_DEFAULT, ICON_FILESEL, x, y, UI_UNIT_X, h, Browse for file or directory.); } else - but= uiDefAutoButR(block, ptr, prop, index, (icon_only)? : NULL, icon, x, y, w, h); + but= uiDefAutoButR(block, ptr, prop, index, (!icon_only)? : NULL, icon, x, y, w, h); uiBlockSetCurLayout(block, layout); return but; ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23214] trunk/blender/source/blender/ editors/interface/interface_widgets.c: UI widget adjustments.
Revision: 23214
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23214
Author: billrey
Date: 2009-09-14 13:42:31 +0200 (Mon, 14 Sep 2009)
Log Message:
---
UI widget adjustments.
I've been looking at some ways to make some of the widgets appear slightly
cleaner and simpler in the UI. Here I've simplified the number field arrow
indicator, and the scroll bar zoom widget.
http://www.reynish.com/files/blender25/ui_widgets_arrows.png
Approved by Matt Ebb too ;)
Modified Paths:
--
trunk/blender/source/blender/editors/interface/interface_widgets.c
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===
--- trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-09-14 11:25:33 UTC (rev 23213)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-09-14 11:42:31 UTC (rev 23214)
@@ -129,17 +129,21 @@
{0.219306 , -0.238501}, {-0.393286 , -0.110949}, {-0.024699 , 0.013908},
{0.343805 , 0.147431}, {-0.272855 , 0.269918}, {0.095909 , 0.388710}};
-static float num_tria_vert[19][2]= {
+static float num_tria_vert[3][2]= {
+{-0.352077, 0.532607}, {-0.352077, -0.549313}, {0.33, -0.008353}};
+
+static int num_tria_face[1][3]= {
+{0, 1, 2}};
+
+static float scroll_circle_vert[16][2]= {
{0.382684, 0.923879}, {0.01, 1.00}, {-0.382683, 0.923880}, {-0.707107,
0.707107},
{-0.923879, 0.382684}, {-1.00, 0.00}, {-0.923880, -0.382684},
{-0.707107, -0.707107},
{-0.382683, -0.923880}, {0.00, -1.00}, {0.382684, -0.923880},
{0.707107, -0.707107},
-{0.923880, -0.382684}, {1.00, -0.00}, {0.923880, 0.382683}, {0.707107,
0.707107},
-{-0.352077, 0.532607}, {-0.352077, -0.549313}, {0.729843, -0.008353}};
+{0.923880, -0.382684}, {1.00, -0.00}, {0.923880, 0.382683}, {0.707107,
0.707107}};
-static int num_tria_face[19][3]= {
-{13, 14, 18}, {17, 5, 6}, {12, 13, 18}, {17, 6, 7}, {15, 18, 14}, {16, 4, 5},
{16, 5, 17}, {18, 11, 12},
-{18, 17, 10}, {18, 10, 11}, {17, 9, 10}, {15, 0, 18}, {18, 0, 16}, {3, 4, 16},
{8, 9, 17}, {8, 17, 7},
-{2, 3, 16}, {1, 2, 16}, {16, 0, 1}};
+static int scroll_circle_face[14][3]= {
+{0, 1, 2}, {2, 0, 3}, {3, 0, 15}, {3, 15, 4}, {4, 15, 14}, {4, 14, 5}, {5, 14,
13}, {5, 13, 6},
+{6, 13, 12}, {6, 12, 7}, {7, 12, 11}, {7, 11, 8}, {8, 11, 10}, {8, 10, 9}};
static float menu_tria_vert[6][2]= {
{-0.41, 0.16}, {0.41, 0.16}, {0, 0.82},
@@ -451,15 +455,50 @@
i2=0; i1= 1;
}
- for(a=0; a19; a++) {
+ for(a=0; a3; a++) {
tria-vec[a][0]= sizex*num_tria_vert[a][i1] + centx;
tria-vec[a][1]= sizey*num_tria_vert[a][i2] + centy;
}
- tria-tot= 19;
+ tria-tot= 3;
tria-index= num_tria_face;
}
+static void widget_scroll_circle(uiWidgetTrias *tria, rcti *rect, float
triasize, char where)
+{
+ float centx, centy, sizex, sizey, minsize;
+ int a, i1=0, i2=1;
+
+ minsize= MIN2(rect-xmax-rect-xmin, rect-ymax-rect-ymin);
+
+ /* center position and size */
+ centx= (float)rect-xmin + 0.5f*minsize;
+ centy= (float)rect-ymin + 0.5f*minsize;
+ sizex= sizey= -0.5f*triasize*minsize;
+
+ if(where=='r') {
+ centx= (float)rect-xmax - 0.5f*minsize;
+ sizex= -sizex;
+ }
+ else if(where=='t') {
+ centy= (float)rect-ymax - 0.5f*minsize;
+ sizey= -sizey;
+ i2=0; i1= 1;
+ }
+ else if(where=='b') {
+ sizex= -sizex;
+ i2=0; i1= 1;
+ }
+
+ for(a=0; a16; a++) {
+ tria-vec[a][0]= sizex*scroll_circle_vert[a][i1] + centx;
+ tria-vec[a][1]= sizey*scroll_circle_vert[a][i2] + centy;
+ }
+
+ tria-tot= 16;
+ tria-index= scroll_circle_face;
+}
+
static void widget_trias_draw(uiWidgetTrias *tria)
{
int a;
@@ -1736,12 +1775,12 @@
wcol-item[3]= 255;
if(horizontal) {
- widget_num_tria(wtb.tria1, slider, 0.6f, 'l');
- widget_num_tria(wtb.tria2, slider, 0.6f, 'r');
+ widget_scroll_circle(wtb.tria1, slider, 0.6f,
'l');
+ widget_scroll_circle(wtb.tria2, slider, 0.6f,
'r');
}
else {
- widget_num_tria(wtb.tria1, slider, 0.6f, 'b');
- widget_num_tria(wtb.tria2, slider, 0.6f, 't');
+ widget_scroll_circle(wtb.tria1, slider, 0.6f,
'b');
+ widget_scroll_circle(wtb.tria2, slider, 0.6f,
't');
}
}
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23215] trunk/blender/source/blender/ editors/interface/interface_widgets.c: Reverted last commit.
Revision: 23215
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23215
Author: billrey
Date: 2009-09-14 14:05:51 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Reverted last commit. Was crashing on startup for some.
Modified Paths:
--
trunk/blender/source/blender/editors/interface/interface_widgets.c
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===
--- trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-09-14 11:42:31 UTC (rev 23214)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-09-14 12:05:51 UTC (rev 23215)
@@ -129,21 +129,17 @@
{0.219306 , -0.238501}, {-0.393286 , -0.110949}, {-0.024699 , 0.013908},
{0.343805 , 0.147431}, {-0.272855 , 0.269918}, {0.095909 , 0.388710}};
-static float num_tria_vert[3][2]= {
-{-0.352077, 0.532607}, {-0.352077, -0.549313}, {0.33, -0.008353}};
-
-static int num_tria_face[1][3]= {
-{0, 1, 2}};
-
-static float scroll_circle_vert[16][2]= {
+static float num_tria_vert[19][2]= {
{0.382684, 0.923879}, {0.01, 1.00}, {-0.382683, 0.923880}, {-0.707107,
0.707107},
{-0.923879, 0.382684}, {-1.00, 0.00}, {-0.923880, -0.382684},
{-0.707107, -0.707107},
{-0.382683, -0.923880}, {0.00, -1.00}, {0.382684, -0.923880},
{0.707107, -0.707107},
-{0.923880, -0.382684}, {1.00, -0.00}, {0.923880, 0.382683}, {0.707107,
0.707107}};
+{0.923880, -0.382684}, {1.00, -0.00}, {0.923880, 0.382683}, {0.707107,
0.707107},
+{-0.352077, 0.532607}, {-0.352077, -0.549313}, {0.729843, -0.008353}};
-static int scroll_circle_face[14][3]= {
-{0, 1, 2}, {2, 0, 3}, {3, 0, 15}, {3, 15, 4}, {4, 15, 14}, {4, 14, 5}, {5, 14,
13}, {5, 13, 6},
-{6, 13, 12}, {6, 12, 7}, {7, 12, 11}, {7, 11, 8}, {8, 11, 10}, {8, 10, 9}};
+static int num_tria_face[19][3]= {
+{13, 14, 18}, {17, 5, 6}, {12, 13, 18}, {17, 6, 7}, {15, 18, 14}, {16, 4, 5},
{16, 5, 17}, {18, 11, 12},
+{18, 17, 10}, {18, 10, 11}, {17, 9, 10}, {15, 0, 18}, {18, 0, 16}, {3, 4, 16},
{8, 9, 17}, {8, 17, 7},
+{2, 3, 16}, {1, 2, 16}, {16, 0, 1}};
static float menu_tria_vert[6][2]= {
{-0.41, 0.16}, {0.41, 0.16}, {0, 0.82},
@@ -455,50 +451,15 @@
i2=0; i1= 1;
}
- for(a=0; a3; a++) {
+ for(a=0; a19; a++) {
tria-vec[a][0]= sizex*num_tria_vert[a][i1] + centx;
tria-vec[a][1]= sizey*num_tria_vert[a][i2] + centy;
}
- tria-tot= 3;
+ tria-tot= 19;
tria-index= num_tria_face;
}
-static void widget_scroll_circle(uiWidgetTrias *tria, rcti *rect, float
triasize, char where)
-{
- float centx, centy, sizex, sizey, minsize;
- int a, i1=0, i2=1;
-
- minsize= MIN2(rect-xmax-rect-xmin, rect-ymax-rect-ymin);
-
- /* center position and size */
- centx= (float)rect-xmin + 0.5f*minsize;
- centy= (float)rect-ymin + 0.5f*minsize;
- sizex= sizey= -0.5f*triasize*minsize;
-
- if(where=='r') {
- centx= (float)rect-xmax - 0.5f*minsize;
- sizex= -sizex;
- }
- else if(where=='t') {
- centy= (float)rect-ymax - 0.5f*minsize;
- sizey= -sizey;
- i2=0; i1= 1;
- }
- else if(where=='b') {
- sizex= -sizex;
- i2=0; i1= 1;
- }
-
- for(a=0; a16; a++) {
- tria-vec[a][0]= sizex*scroll_circle_vert[a][i1] + centx;
- tria-vec[a][1]= sizey*scroll_circle_vert[a][i2] + centy;
- }
-
- tria-tot= 16;
- tria-index= scroll_circle_face;
-}
-
static void widget_trias_draw(uiWidgetTrias *tria)
{
int a;
@@ -1775,12 +1736,12 @@
wcol-item[3]= 255;
if(horizontal) {
- widget_scroll_circle(wtb.tria1, slider, 0.6f,
'l');
- widget_scroll_circle(wtb.tria2, slider, 0.6f,
'r');
+ widget_num_tria(wtb.tria1, slider, 0.6f, 'l');
+ widget_num_tria(wtb.tria2, slider, 0.6f, 'r');
}
else {
- widget_scroll_circle(wtb.tria1, slider, 0.6f,
'b');
- widget_scroll_circle(wtb.tria2, slider, 0.6f,
't');
+ widget_num_tria(wtb.tria1, slider, 0.6f, 'b');
+ widget_num_tria(wtb.tria2, slider, 0.6f, 't');
}
}
widgetbase_draw(wtb, wcol);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23216] trunk/blender/release/ui: UI: don' t hide Object menu in 3d view header when there is no
Revision: 23216 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23216 Author: blendix Date: 2009-09-14 14:16:35 +0200 (Mon, 14 Sep 2009) Log Message: --- UI: don't hide Object menu in 3d view header when there is no active object, to avoid buttons jumping too much. Also small change in collision panel code. Modified Paths: -- trunk/blender/release/ui/buttons_physics_field.py trunk/blender/release/ui/space_view3d.py Modified: trunk/blender/release/ui/buttons_physics_field.py === --- trunk/blender/release/ui/buttons_physics_field.py 2009-09-14 12:05:51 UTC (rev 23215) +++ trunk/blender/release/ui/buttons_physics_field.py 2009-09-14 12:16:35 UTC (rev 23216) @@ -184,18 +184,16 @@ #row.itemR(md, render, text=) #row.itemR(md, realtime, text=) - coll = md.settings + settings = md.settings else: # add modifier split.item_enumO(object.modifier_add, type, 'COLLISION', text=Add) split.itemL() - coll = None + settings = None - if coll: - settings = context.object.collision - + if settings: layout.active = settings.enabled split = layout.split() Modified: trunk/blender/release/ui/space_view3d.py === --- trunk/blender/release/ui/space_view3d.py2009-09-14 12:05:51 UTC (rev 23215) +++ trunk/blender/release/ui/space_view3d.py2009-09-14 12:16:35 UTC (rev 23216) @@ -34,6 +34,8 @@ if mode_string not in ['PAINT_WEIGHT', 'PAINT_TEXTURE']: sub.itemM(VIEW3D_MT_%s % mode_string) + else: + sub.itemM(VIEW3D_MT_OBJECT) layout.template_header_3D() ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23217] trunk/blender/source/blender: Depsgraph:
Revision: 23217
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23217
Author: blendix
Date: 2009-09-14 14:26:34 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Depsgraph:
* Move function to compute visible screen layers to BKE.
* Use this now in the depsgraph, was still using this all layers
to flush. Still missing a way to get the current scene in
background mode..
* Also two more function to not require a scene pointer anymore:
* DAG_object_update_flags is now DAG_id_update_flags.
* DAG_ids_flush_update is now available next to DAG_scene_flush_update.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_depsgraph.h
trunk/blender/source/blender/blenkernel/BKE_screen.h
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/screen.c
trunk/blender/source/blender/editors/animation/anim_deps.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/include/ED_screen.h
trunk/blender/source/blender/editors/preview/previewrender.c
trunk/blender/source/blender/editors/screen/screen_edit.c
Modified: trunk/blender/source/blender/blenkernel/BKE_depsgraph.h
===
--- trunk/blender/source/blender/blenkernel/BKE_depsgraph.h 2009-09-14
12:16:35 UTC (rev 23216)
+++ trunk/blender/source/blender/blenkernel/BKE_depsgraph.h 2009-09-14
12:26:34 UTC (rev 23217)
@@ -96,19 +96,24 @@
/* ** API *** */
/* Note that the DAG never executes changes in Objects, only sets flags in
Objects */
+ /* (re)-create dependency graph for scene */
void DAG_scene_sort(struct Scene *sce);
/* flag all objects that need recalc because they're animated */
void DAG_scene_update_flags(struct Scene *sce, unsigned int lay);
- /* flag all objects that need recalc because they're animated,
influencing this object only */
-void DAG_object_update_flags(struct Scene *sce, struct Object *ob, unsigned
int lay);
-
/* flushes all recalc flags in objects down the dependency tree
*/
void DAG_scene_flush_update(struct Scene *sce, unsigned int lay, int time);
+
+ /* flag all IDs that need recalc because they're animated,
influencing
+ this ID only. only for objects currently */
+void DAG_id_update_flags(struct ID *id);
/* flushes all recalc flags for this object down the dependency
tree,
- but not the DAG only supports objects and object data
currently */
+ but note the DAG only supports objects and object data
currently */
void DAG_id_flush_update(struct ID *id, short flag);
+ /* when setting manual RECALC flags, call this afterwards */
+void DAG_ids_flush_update(int time);
+ /* (re)-create dependency graph for armature pose */
void DAG_pose_sort(struct Object *ob);
#endif
Modified: trunk/blender/source/blender/blenkernel/BKE_screen.h
===
--- trunk/blender/source/blender/blenkernel/BKE_screen.h2009-09-14
12:16:35 UTC (rev 23216)
+++ trunk/blender/source/blender/blenkernel/BKE_screen.h2009-09-14
12:26:34 UTC (rev 23217)
@@ -230,11 +230,11 @@
/* area/regions */
struct ARegion *BKE_area_region_copy(struct SpaceType *st, struct ARegion *ar);
void BKE_area_region_free(struct SpaceType *st, struct ARegion *ar);
+void BKE_screen_area_free(struct ScrArea *sa);
-void BKE_screen_area_free(struct ScrArea *sa);
-
+/* screen */
void free_screen(struct bScreen *sc);
+unsigned int BKE_screen_visible_layers(struct bScreen *screen);
-
#endif
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2009-09-14
12:16:35 UTC (rev 23216)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2009-09-14
12:26:34 UTC (rev 23217)
@@ -78,6 +78,7 @@
#include BKE_pointcache.h
#include BKE_utildefines.h
#include BKE_scene.h
+#include BKE_screen.h
#include MEM_guardedalloc.h
@@ -2142,31 +2143,59 @@
}
-void DAG_id_flush_update(ID *id, short flag)
+static void dag_current_scene_layers(Main *bmain, Scene **sce, unsigned int
*lay)
{
- Main *bmain= G.main;
wmWindowManager *wm;
wmWindow *win;
- Scene *sce;
- Object *obt, *ob= NULL;
- short idtype;
/* only one scene supported currently, making more scenes work
correctly requires changes beyond just the dependency graph */
+ *sce= NULL;
+ *lay= 0;
+
if((wm= bmain-wm.first)) {
- /* if we have a windowmanager, use sce from first window */
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23218] trunk/blender/source/blender/ editors/interface/interface_widgets.c: Third widget commit ; )
Revision: 23218
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23218
Author: billrey
Date: 2009-09-14 14:28:59 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Third widget commit ;)
Thanks to Broken for finding the bug.
Modified Paths:
--
trunk/blender/source/blender/editors/interface/interface_widgets.c
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===
--- trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-09-14 12:26:34 UTC (rev 23217)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-09-14 12:28:59 UTC (rev 23218)
@@ -129,17 +129,21 @@
{0.219306 , -0.238501}, {-0.393286 , -0.110949}, {-0.024699 , 0.013908},
{0.343805 , 0.147431}, {-0.272855 , 0.269918}, {0.095909 , 0.388710}};
-static float num_tria_vert[19][2]= {
+static float num_tria_vert[3][2]= {
+{-0.352077, 0.532607}, {-0.352077, -0.549313}, {0.33, -0.008353}};
+
+static int num_tria_face[1][3]= {
+{0, 1, 2}};
+
+static float scroll_circle_vert[16][2]= {
{0.382684, 0.923879}, {0.01, 1.00}, {-0.382683, 0.923880}, {-0.707107,
0.707107},
{-0.923879, 0.382684}, {-1.00, 0.00}, {-0.923880, -0.382684},
{-0.707107, -0.707107},
{-0.382683, -0.923880}, {0.00, -1.00}, {0.382684, -0.923880},
{0.707107, -0.707107},
-{0.923880, -0.382684}, {1.00, -0.00}, {0.923880, 0.382683}, {0.707107,
0.707107},
-{-0.352077, 0.532607}, {-0.352077, -0.549313}, {0.729843, -0.008353}};
+{0.923880, -0.382684}, {1.00, -0.00}, {0.923880, 0.382683}, {0.707107,
0.707107}};
-static int num_tria_face[19][3]= {
-{13, 14, 18}, {17, 5, 6}, {12, 13, 18}, {17, 6, 7}, {15, 18, 14}, {16, 4, 5},
{16, 5, 17}, {18, 11, 12},
-{18, 17, 10}, {18, 10, 11}, {17, 9, 10}, {15, 0, 18}, {18, 0, 16}, {3, 4, 16},
{8, 9, 17}, {8, 17, 7},
-{2, 3, 16}, {1, 2, 16}, {16, 0, 1}};
+static int scroll_circle_face[14][3]= {
+{0, 1, 2}, {2, 0, 3}, {3, 0, 15}, {3, 15, 4}, {4, 15, 14}, {4, 14, 5}, {5, 14,
13}, {5, 13, 6},
+{6, 13, 12}, {6, 12, 7}, {7, 12, 11}, {7, 11, 8}, {8, 11, 10}, {8, 10, 9}};
static float menu_tria_vert[6][2]= {
{-0.41, 0.16}, {0.41, 0.16}, {0, 0.82},
@@ -451,15 +455,50 @@
i2=0; i1= 1;
}
- for(a=0; a19; a++) {
+ for(a=0; a3; a++) {
tria-vec[a][0]= sizex*num_tria_vert[a][i1] + centx;
tria-vec[a][1]= sizey*num_tria_vert[a][i2] + centy;
}
- tria-tot= 19;
+ tria-tot= 1;
tria-index= num_tria_face;
}
+static void widget_scroll_circle(uiWidgetTrias *tria, rcti *rect, float
triasize, char where)
+{
+ float centx, centy, sizex, sizey, minsize;
+ int a, i1=0, i2=1;
+
+ minsize= MIN2(rect-xmax-rect-xmin, rect-ymax-rect-ymin);
+
+ /* center position and size */
+ centx= (float)rect-xmin + 0.5f*minsize;
+ centy= (float)rect-ymin + 0.5f*minsize;
+ sizex= sizey= -0.5f*triasize*minsize;
+
+ if(where=='r') {
+ centx= (float)rect-xmax - 0.5f*minsize;
+ sizex= -sizex;
+ }
+ else if(where=='t') {
+ centy= (float)rect-ymax - 0.5f*minsize;
+ sizey= -sizey;
+ i2=0; i1= 1;
+ }
+ else if(where=='b') {
+ sizex= -sizex;
+ i2=0; i1= 1;
+ }
+
+ for(a=0; a16; a++) {
+ tria-vec[a][0]= sizex*scroll_circle_vert[a][i1] + centx;
+ tria-vec[a][1]= sizey*scroll_circle_vert[a][i2] + centy;
+ }
+
+ tria-tot= 14;
+ tria-index= scroll_circle_face;
+}
+
static void widget_trias_draw(uiWidgetTrias *tria)
{
int a;
@@ -1736,12 +1775,12 @@
wcol-item[3]= 255;
if(horizontal) {
- widget_num_tria(wtb.tria1, slider, 0.6f, 'l');
- widget_num_tria(wtb.tria2, slider, 0.6f, 'r');
+ widget_scroll_circle(wtb.tria1, slider, 0.6f,
'l');
+ widget_scroll_circle(wtb.tria2, slider, 0.6f,
'r');
}
else {
- widget_num_tria(wtb.tria1, slider, 0.6f, 'b');
- widget_num_tria(wtb.tria2, slider, 0.6f, 't');
+ widget_scroll_circle(wtb.tria1, slider, 0.6f,
'b');
+ widget_scroll_circle(wtb.tria2, slider, 0.6f,
't');
}
}
widgetbase_draw(wtb, wcol);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23219] trunk/blender: Link/Append, small changes:
Revision: 23219
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23219
Author: blendix
Date: 2009-09-14 14:30:49 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Link/Append, small changes:
* Added separate menu items for Link and Append.
* Change some OPERATOR_FINISHED to OPERATOR_CANCELLED.
* Remove some IPO specific hacks, these are no longer ID blocks,
so not necessary to take into account.
* Some comment and code formatting tweaks.
Modified Paths:
--
trunk/blender/release/ui/space_info.py
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/release/ui/space_info.py
===
--- trunk/blender/release/ui/space_info.py 2009-09-14 12:28:59 UTC (rev
23218)
+++ trunk/blender/release/ui/space_info.py 2009-09-14 12:30:49 UTC (rev
23219)
@@ -61,7 +61,8 @@
layout.itemS()
layout.operator_context = INVOKE_AREA
- layout.itemO(wm.link_append, text=Append or Link)
+ layout.itemO(wm.link_append, text=Link)
+ layout.item_booleanO(wm.link_append, link, False,
text=Append)
layout.itemS()
layout.itemM(INFO_MT_file_import)
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===
--- trunk/blender/source/blender/blenkernel/intern/library.c2009-09-14
12:28:59 UTC (rev 23218)
+++ trunk/blender/source/blender/blenkernel/intern/library.c2009-09-14
12:30:49 UTC (rev 23219)
@@ -455,16 +455,14 @@
while(a--) flag_listbase_ids(lbarray[a], flag, value);
}
-void recalc_all_library_objects(struct Main *main)
+void recalc_all_library_objects(Main *main)
{
- /* DISPLISTS? */
- Object *ob= main-object.first;
- while(ob) {
- if(ob-id.lib) {
+ Object *ob;
+
+ /* flag for full recalc */
+ for(ob=main-object.first; ob; ob=ob-id.next)
+ if(ob-id.lib)
ob-recalc |= OB_RECALC;
- }
- ob= ob-id.next;
- }
}
/* note: MAX_LIBARRAY define should match this code */
Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===
--- trunk/blender/source/blender/editors/space_file/filelist.c 2009-09-14
12:28:59 UTC (rev 23218)
+++ trunk/blender/source/blender/editors/space_file/filelist.c 2009-09-14
12:30:49 UTC (rev 23219)
@@ -1184,11 +1184,6 @@
id= lb-first;
filelist-numfiles= 0;
while(id) {
- /* X TODO: the selection of the ipo blocktype might
go somewhere else?
- if(filelist-has_func idcode==ID_IP) {
- if(filelist-ipotype== ((Ipo *)id)-blocktype)
filelist-numfiles++;
- }
- else */
if (!filelist-hide_dot || id-name[2] != '.') {
filelist-numfiles++;
}
@@ -1214,14 +1209,6 @@
totlib= totbl= 0;
while(id) {
-#if 0
- // X TODO: this is deprecated, checks for correct
IPO block?
- ok= 0;
- if(filelist-has_func idcode==ID_IP) {
- if(filelist-ipotype== ((Ipo *)id)-blocktype)
ok= 1;
- }
- else ok= 1;
-#endif
ok = 1;
if(ok) {
if (!filelist-hide_dot || id-name[2] != '.') {
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2009-09-14 12:28:59 UTC (rev 23218)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2009-09-14 12:30:49 UTC (rev 23219)
@@ -247,7 +247,7 @@
ot-idname= idname;
ot-name= name;
- ot-flag= OPTYPE_MACRO | flag;
+ ot-flag= OPTYPE_MACRO|flag;
ot-exec= wm_macro_exec;
ot-invoke= wm_macro_invoke;
@@ -542,7 +542,7 @@
}
/* op-invoke */
-static void redo_cb(bContext *C, void *arg_op, void *arg2)
+static void redo_cb(bContext *C, void *arg_op, int event)
{
wmOperator *lastop= arg_op;
@@ -564,7 +564,7 @@
block= uiBeginBlock(C, ar, redo_popup, UI_EMBOSS);
uiBlockClearFlag(block, UI_BLOCK_LOOP);
uiBlockSetFlag(block, UI_BLOCK_KEEP_OPEN|UI_BLOCK_RET_1);
- uiBlockSetFunc(block, redo_cb, arg_op, NULL);
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23220] trunk/blender: *Changed texture blend property Flip XY to a proper enum.
Revision: 23220
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23220
Author: billrey
Date: 2009-09-14 15:31:58 +0200 (Mon, 14 Sep 2009)
Log Message:
---
*Changed texture blend property Flip XY to a proper enum.
*Minor adjustments to lamp UI
*Fixed issue #19319 (missing notifier)
Modified Paths:
--
trunk/blender/release/ui/buttons_data_lamp.py
trunk/blender/release/ui/buttons_texture.py
trunk/blender/source/blender/makesrna/intern/rna_lamp.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/blender/makesrna/intern/rna_world.c
Modified: trunk/blender/release/ui/buttons_data_lamp.py
===
--- trunk/blender/release/ui/buttons_data_lamp.py 2009-09-14 12:30:49 UTC
(rev 23219)
+++ trunk/blender/release/ui/buttons_data_lamp.py 2009-09-14 13:31:58 UTC
(rev 23220)
@@ -75,7 +75,7 @@
col.itemR(lamp, diffuse)
class DATA_PT_sunsky(DataButtonsPanel):
- __label__ = Sun/Sky
+ __label__ = Sky Atmosphere
def poll(self, context):
lamp = context.lamp
@@ -86,10 +86,9 @@
lamp = context.lamp.sky
- row = layout.row()
- row.itemR(lamp, sky)
- row.itemR(lamp, atmosphere)
+ layout.itemR(lamp, sky)
+
row = layout.row()
row.active = lamp.sky or lamp.atmosphere
row.itemR(lamp, atmosphere_turbidity, text=Turbidity)
@@ -98,38 +97,39 @@
col = split.column()
col.active = lamp.sky
- col.itemL(text=Blend Mode:)
- sub = col.column(align=True)
+ col.itemL(text=Blending:)
+ sub = col.column()
sub.itemR(lamp, sky_blend_type, text=)
sub.itemR(lamp, sky_blend, text=Factor)
col.itemL(text=Color Space:)
- sub = col.column(align=True)
- sub.itemR(lamp, sky_color_space, text=)
+ sub = col.column()
+ sub.row().itemR(lamp, sky_color_space, expand=True)
sub.itemR(lamp, sky_exposure, text=Exposure)
col = split.column()
col.active = lamp.sky
col.itemL(text=Horizon:)
- sub = col.column(align=True)
+ sub = col.column()
sub.itemR(lamp, horizon_brightness, text=Brightness)
sub.itemR(lamp, spread, text=Spread)
col.itemL(text=Sun:)
- sub = col.column(align=True)
+ sub = col.column()
sub.itemR(lamp, sun_brightness, text=Brightness)
sub.itemR(lamp, sun_size, text=Size)
sub.itemR(lamp, backscattered_light, slider=True,text=Back
Light)
layout.itemS()
+ layout.itemR(lamp, atmosphere)
+
split = layout.split()
col = split.column()
col.active = lamp.atmosphere
- col.itemL(text=Sun:)
- col.itemR(lamp, sun_intensity, text=Intensity)
- col.itemL(text=Scale Distance:)
+ col.itemL(text=Intensity:)
+ col.itemR(lamp, sun_intensity, text=Sun)
col.itemR(lamp, atmosphere_distance_factor, text=Distance)
col = split.column()
Modified: trunk/blender/release/ui/buttons_texture.py
===
--- trunk/blender/release/ui/buttons_texture.py 2009-09-14 12:30:49 UTC (rev
23219)
+++ trunk/blender/release/ui/buttons_texture.py 2009-09-14 13:31:58 UTC (rev
23220)
@@ -381,7 +381,10 @@
tex = context.texture
layout.itemR(tex, progression)
- layout.itemR(tex, flip_axis)
+ sub = layout.row()
+
+ sub.active = (tex.progression in ('LINEAR', 'QUADRATIC',
'EASING', 'RADIAL'))
+ sub.itemR(tex, flip_axis, expand=True)
class TEXTURE_PT_stucci(TextureTypePanel):
__label__ = Stucci
Modified: trunk/blender/source/blender/makesrna/intern/rna_lamp.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_lamp.c 2009-09-14
12:30:49 UTC (rev 23219)
+++ trunk/blender/source/blender/makesrna/intern/rna_lamp.c 2009-09-14
13:31:58 UTC (rev 23220)
@@ -431,7 +431,7 @@
prop= RNA_def_property(srna, shadow_color, PROP_FLOAT, PROP_COLOR);
RNA_def_property_float_sdna(prop, NULL, shdwr);
RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop,
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23224] trunk/blender/release/io/netrender : netrender: add Animation on network button to send job to master and gather the results in one step.
Revision: 23224
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23224
Author: theeth
Date: 2009-09-14 18:30:53 +0200 (Mon, 14 Sep 2009)
Log Message:
---
netrender: add Animation on network button to send job to master and gather
the results in one step.
Modified Paths:
--
trunk/blender/release/io/netrender/operators.py
trunk/blender/release/io/netrender/ui.py
Modified: trunk/blender/release/io/netrender/operators.py
===
--- trunk/blender/release/io/netrender/operators.py 2009-09-14 16:00:42 UTC
(rev 23223)
+++ trunk/blender/release/io/netrender/operators.py 2009-09-14 16:30:53 UTC
(rev 23224)
@@ -7,6 +7,39 @@
import netrender.model
@rnaOperator
+class RENDER_OT_netclientanim(bpy.types.Operator):
+ '''
+ Operator documentation text, will be used for the operator tooltip and
python docs.
+ '''
+ __idname__ = render.netclientanim
+ __label__ = Net Render Client Anim
+
+ # List of operator properties, the attributes will be assigned
+ # to the class instance from the operator settings before calling.
+
+ __props__ = []
+
+ def poll(self, context):
+ return True
+
+ def execute(self, context):
+ scene = context.scene
+
+ conn = clientConnection(scene)
+
+ if conn:
+ # Sending file
+ scene.network_render.job_id =
client.clientSendJob(conn, scene, True)
+ conn.close()
+
+ bpy.ops.screen.render('INVOKE_AREA', animation=True)
+
+ return ('FINISHED',)
+
+ def invoke(self, context, event):
+ return self.execute(context)
+
+...@rnaoperator
class RENDER_OT_netclientsend(bpy.types.Operator):
'''
Operator documentation text, will be used for the operator tooltip and
python docs.
@@ -30,6 +63,7 @@
if conn:
# Sending file
scene.network_render.job_id =
client.clientSendJob(conn, scene, True)
+ conn.close()
return ('FINISHED',)
Modified: trunk/blender/release/io/netrender/ui.py
===
--- trunk/blender/release/io/netrender/ui.py2009-09-14 16:00:42 UTC (rev
23223)
+++ trunk/blender/release/io/netrender/ui.py2009-09-14 16:30:53 UTC (rev
23224)
@@ -48,6 +48,7 @@
col = split.column()
+ col.itemO(render.netclientanim, icon='ICON_RENDER_ANIMATION',
text=Animaton on network)
col.itemR(scene.network_render, mode)
col.itemR(scene.network_render, server_address)
col.itemR(scene.network_render, server_port)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23223] trunk/blender/source/blender: Bugfix with py operator api and modal operators.
Revision: 23223
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23223
Author: theeth
Date: 2009-09-14 18:00:42 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Bugfix with py operator api and modal operators. Modal operators would keep a
reference to Reports locally allocated in the api functions, which would crash
and burn later when the operator would actually stop.
This commit introduces a flag at the Reports level that can be used to indicate
that it needs to be freed (on top of the flag already existing in the operator,
which I guess could be removed).
Reports for operators called through python are only persisted if they indicate
that they are running modal.
Modified Paths:
--
trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
trunk/blender/source/blender/python/intern/bpy_operator.c
trunk/blender/source/blender/windowmanager/intern/wm.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
===
--- trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
2009-09-14 14:55:49 UTC (rev 23222)
+++ trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
2009-09-14 16:00:42 UTC (rev 23223)
@@ -80,6 +80,7 @@
enum ReportListFlags {
RPT_PRINT = 1,
RPT_STORE = 2,
+ RPT_FREE = 4,
};
typedef struct Report {
struct Report *next, *prev;
Modified: trunk/blender/source/blender/python/intern/bpy_operator.c
===
--- trunk/blender/source/blender/python/intern/bpy_operator.c 2009-09-14
14:55:49 UTC (rev 23222)
+++ trunk/blender/source/blender/python/intern/bpy_operator.c 2009-09-14
16:00:42 UTC (rev 23223)
@@ -79,16 +79,21 @@
if (error_val==0) {
- ReportList reports;
+ ReportList *reports;
- BKE_reports_init(reports, RPT_STORE);
+ reports= MEM_mallocN(sizeof(ReportList),
wmOperatorReportList);
+ BKE_reports_init(reports, RPT_STORE);
- WM_operator_call_py(C, ot, context, ptr, reports);
+ WM_operator_call_py(C, ot, context, ptr, reports);
- if(BPy_reports_to_error(reports))
+ if(BPy_reports_to_error(reports))
error_val = -1;
- BKE_reports_clear(reports);
+ BKE_reports_clear(reports);
+ if ((reports-flag RPT_FREE) == 0)
+ {
+ MEM_freeN(reports);
+ }
}
WM_operator_properties_free(ptr);
Modified: trunk/blender/source/blender/windowmanager/intern/wm.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm.c 2009-09-14
14:55:49 UTC (rev 23222)
+++ trunk/blender/source/blender/windowmanager/intern/wm.c 2009-09-14
16:00:42 UTC (rev 23223)
@@ -69,7 +69,7 @@
MEM_freeN(op-properties);
}
- if(op-reports (op-flag OPERATOR_REPORT_FREE)) {
+ if(op-reports ((op-flag OPERATOR_REPORT_FREE) ||
(op-reports-flag RPT_FREE))) {
BKE_reports_clear(op-reports);
MEM_freeN(op-reports);
}
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-09-14 14:55:49 UTC (rev 23222)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-09-14 16:00:42 UTC (rev 23223)
@@ -555,6 +555,11 @@
retval= wm_operator_call_internal(C, ot, context, properties, reports);
+ if (retval OPERATOR_RUNNING_MODAL)
+ {
+ reports-flag |= RPT_FREE;
+ }
+
return retval;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23227] trunk/blender/source/blender: use static functions where possible for some local functions.
Revision: 23227
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23227
Author: campbellbarton
Date: 2009-09-14 18:52:06 +0200 (Mon, 14 Sep 2009)
Log Message:
---
use static functions where possible for some local functions.
Modified Paths:
--
trunk/blender/source/blender/blenfont/intern/blf.c
trunk/blender/source/blender/blenfont/intern/blf_dir.c
trunk/blender/source/blender/blenfont/intern/blf_font.c
trunk/blender/source/blender/blenfont/intern/blf_glyph.c
trunk/blender/source/blender/blenkernel/intern/action.c
trunk/blender/source/blender/blenkernel/intern/anim_sys.c
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/font.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/packedFile.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/sequence.c
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
trunk/blender/source/blender/blenlib/intern/BLI_kdtree.c
trunk/blender/source/blender/blenlib/intern/arithb.c
trunk/blender/source/blender/blenlib/intern/freetypefont.c
trunk/blender/source/blender/blenlib/intern/graph.c
trunk/blender/source/blender/blenlib/intern/noise.c
trunk/blender/source/blender/blenlib/intern/threads.c
trunk/blender/source/blender/makesrna/intern/rna_action.c
trunk/blender/source/blender/makesrna/intern/rna_animation.c
trunk/blender/source/blender/makesrna/intern/rna_armature.c
trunk/blender/source/blender/makesrna/intern/rna_brush.c
trunk/blender/source/blender/makesrna/intern/rna_constraint.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_define.c
trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
trunk/blender/source/blender/makesrna/intern/rna_gpencil.c
trunk/blender/source/blender/makesrna/intern/rna_group.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_material.c
trunk/blender/source/blender/makesrna/intern/rna_meta.c
trunk/blender/source/blender/makesrna/intern/rna_nla.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/makesrna/intern/rna_pose.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_sensor.c
trunk/blender/source/blender/makesrna/intern/rna_sequence.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/blenfont/intern/blf.c
===
--- trunk/blender/source/blender/blenfont/intern/blf.c 2009-09-14 16:46:34 UTC
(rev 23226)
+++ trunk/blender/source/blender/blenfont/intern/blf.c 2009-09-14 16:52:06 UTC
(rev 23227)
@@ -102,7 +102,7 @@
blf_font_exit();
}
-int blf_search(char *name)
+static int blf_search(char *name)
{
FontBLF *font;
int i;
Modified: trunk/blender/source/blender/blenfont/intern/blf_dir.c
===
--- trunk/blender/source/blender/blenfont/intern/blf_dir.c 2009-09-14
16:46:34 UTC (rev 23226)
+++ trunk/blender/source/blender/blenfont/intern/blf_dir.c 2009-09-14
16:52:06 UTC (rev 23227)
@@ -51,7 +51,7 @@
static ListBase global_font_dir= { NULL, NULL };
-DirBLF *blf_dir_find(const char *path)
+static DirBLF *blf_dir_find(const char *path)
{
DirBLF *p;
Modified: trunk/blender/source/blender/blenfont/intern/blf_font.c
===
--- trunk/blender/source/blender/blenfont/intern/blf_font.c 2009-09-14
16:46:34 UTC (rev 23226)
+++ trunk/blender/source/blender/blenfont/intern/blf_font.c 2009-09-14
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23226] trunk/blender/source/blender/ blenkernel/intern/pointcache.c: Smoke:
Revision: 23226
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23226
Author: genscher
Date: 2009-09-14 18:46:34 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Smoke:
* Fixing some gcc warnings
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/pointcache.c
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2009-09-14
16:43:13 UTC (rev 23225)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2009-09-14
16:46:34 UTC (rev 23226)
@@ -570,9 +570,9 @@
SmokeDomainSettings *sds = smd-domain;
if(sds-wt) {
- unsigned int res_big_array[3];
- unsigned int res_big;
- unsigned int res = sds-res[0]*sds-res[1]*sds-res[2];
+ int res_big_array[3];
+ int res_big;
+ int res = sds-res[0]*sds-res[1]*sds-res[2];
float *dens, *densold, *tcu, *tcv, *tcw;
unsigned int in_len = sizeof(float)*(unsigned int)res;
unsigned int in_len_big;
@@ -678,8 +678,8 @@
SmokeDomainSettings *sds = smd-domain;
if(sds-fluid) {
- unsigned int res = sds-res[0]*sds-res[1]*sds-res[2];
- unsigned int res_big, res_big_array[3];
+ int res = sds-res[0]*sds-res[1]*sds-res[2];
+ int res_big, res_big_array[3];
float *dens, *densold, *tcu, *tcv, *tcw;
unsigned int out_len = sizeof(float)*(unsigned int)res;
unsigned int out_len_big;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23228] trunk/blender/source/blender/ python/generic/Mathutils.c: fix warning
Revision: 23228
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23228
Author: campbellbarton
Date: 2009-09-14 19:13:58 +0200 (Mon, 14 Sep 2009)
Log Message:
---
fix warning
Modified Paths:
--
trunk/blender/source/blender/python/generic/Mathutils.c
Modified: trunk/blender/source/blender/python/generic/Mathutils.c
===
--- trunk/blender/source/blender/python/generic/Mathutils.c 2009-09-14
16:52:06 UTC (rev 23227)
+++ trunk/blender/source/blender/python/generic/Mathutils.c 2009-09-14
17:13:58 UTC (rev 23228)
@@ -437,7 +437,7 @@
mat[8] = 1.0f;
} else if((strcmp(axis, r) == 0) || (strcmp(axis, R) == 0)) {
//arbitrary rotation
- AxisAngleToMat3(vec-vec, angle, (float *)mat);
+ AxisAngleToMat3(vec-vec, angle, (float (*)[3])mat);
} else {
PyErr_SetString(PyExc_AttributeError,
Mathutils.RotationMatrix(): unrecognizable axis of rotation type - expected
x,y,z or r\n);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23221] trunk/blender/extern: Fixing CRLF by changing style to native...
Revision: 23221 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23221 Author: sirdude Date: 2009-09-14 16:45:32 +0200 (Mon, 14 Sep 2009) Log Message: --- Fixing CRLF by changing style to native... (There were a couple of files that had mixed) Kent Modified Paths: -- trunk/blender/extern/bullet2/src/Bullet-C-Api.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.cpp trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.cpp trunk/blender/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.cpp trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp trunk/blender/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btActionInterface.h
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23229] trunk/blender/source/blender/ blenkernel/intern/smoke.c: Smoke:
Revision: 23229
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23229
Author: genscher
Date: 2009-09-14 19:22:51 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Smoke:
* Only simulate smoke when starting from startframe
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/smoke.c
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===
--- trunk/blender/source/blender/blenkernel/intern/smoke.c 2009-09-14
17:13:58 UTC (rev 23228)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2009-09-14
17:22:51 UTC (rev 23229)
@@ -1123,18 +1123,23 @@
cache_wt = sds-point_cache[1];
BKE_ptcache_id_from_smoke_turbulence(pid_wt, ob, smd);
+ if(!smd-domain-fluid)
+ {
+ BKE_ptcache_id_reset(scene, pid,
PTCACHE_RESET_OUTDATED);
+ BKE_ptcache_id_reset(scene, pid_wt,
PTCACHE_RESET_OUTDATED);
+ }
+
if(framenr startframe)
return;
if(framenr endframe)
return;
- if(!smd-domain-fluid)
- {
- BKE_ptcache_id_reset(scene, pid,
PTCACHE_RESET_OUTDATED);
- BKE_ptcache_id_reset(scene, pid_wt,
PTCACHE_RESET_OUTDATED);
- }
+ if(!smd-domain-fluid (framenr != startframe))
+ return;
+ // printf(startframe: %d, framenr: %d\n, startframe, framenr);
+
if(!smokeModifier_init(smd, ob, scene, dm))
{
printf(bad smokeModifier_init\n);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23222] branches/soc-2009-kazanbas: Reverted Mesh. verts from dynamic array since it breaks foreach_set used by import scripts .
Revision: 23222
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23222
Author: kazanbas
Date: 2009-09-14 16:55:49 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Reverted Mesh.verts from dynamic array since it breaks foreach_set used by
import scripts.
Did a few fixes in scripts to reflect recent RNA changes.
Modified Paths:
--
branches/soc-2009-kazanbas/release/io/export_obj.py
branches/soc-2009-kazanbas/release/io/export_x3d.py
branches/soc-2009-kazanbas/release/io/import_3ds.py
branches/soc-2009-kazanbas/release/io/import_obj.py
branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_array.c
branches/soc-2009-kazanbas/source/blender/python/intern/bpy_rna.c
Modified: branches/soc-2009-kazanbas/release/io/export_obj.py
===
--- branches/soc-2009-kazanbas/release/io/export_obj.py 2009-09-14 14:45:32 UTC
(rev 23221)
+++ branches/soc-2009-kazanbas/release/io/export_obj.py 2009-09-14 14:55:49 UTC
(rev 23222)
@@ -118,8 +118,8 @@
if mat:
file.write('Ns %.6f\n' % ((mat.specular_hardness-1) *
1.9607843137254901) ) # Hardness, convert blenders 1-511 to MTL's
file.write('Ka %.6f %.6f %.6f\n' %
tuple([c*mat.ambient for c in worldAmb]) ) # Ambient, uses mirror colour,
- file.write('Kd %.6f %.6f %.6f\n' %
tuple([c*mat.diffuse_reflection for c in mat.diffuse_color]) ) # Diffuse
- file.write('Ks %.6f %.6f %.6f\n' %
tuple([c*mat.specular_reflection for c in mat.specular_color]) ) # Specular
+ file.write('Kd %.6f %.6f %.6f\n' %
tuple([c*mat.diffuse_intensity for c in mat.diffuse_color]) ) # Diffuse
+ file.write('Ks %.6f %.6f %.6f\n' %
tuple([c*mat.specular_intensity for c in mat.specular_color]) ) # Specular
if hasattr(mat, ior):
file.write('Ni %.6f\n' % mat.ior) # Refraction
index
else:
@@ -129,7 +129,7 @@
# 0 to disable lighting, 1 for ambient diffuse only
(specular color set to black), 2 for full lighting.
if mat.shadeless:
file.write('illum 0\n') # ignore lighting
- elif mat.specular_reflection == 0:
+ elif mat.specular_intensity == 0:
file.write('illum 1\n') # no specular.
else:
file.write('illum 2\n') # light normaly
Modified: branches/soc-2009-kazanbas/release/io/export_x3d.py
===
--- branches/soc-2009-kazanbas/release/io/export_x3d.py 2009-09-14 14:45:32 UTC
(rev 23221)
+++ branches/soc-2009-kazanbas/release/io/export_x3d.py 2009-09-14 14:55:49 UTC
(rev 23222)
@@ -770,7 +770,7 @@
for i in range(alltexture):
tex = alltextures[i]
- if tex.type != 'IMAGE':
+ if tex.type != 'IMAGE' or tex.image == None:
continue
namemat = tex.name
Modified: branches/soc-2009-kazanbas/release/io/import_3ds.py
===
--- branches/soc-2009-kazanbas/release/io/import_3ds.py 2009-09-14 14:45:32 UTC
(rev 23221)
+++ branches/soc-2009-kazanbas/release/io/import_3ds.py 2009-09-14 14:55:49 UTC
(rev 23222)
@@ -463,7 +463,8 @@
'''
if contextMatrix_rot:
- ob.matrix = [x for row in contextMatrix_rot for
x in row]
+ # ob.matrix = [x for row in contextMatrix_rot
for x in row]
+ ob.matrix = contextMatrix_rot
# ob.setMatrix(contextMatrix_rot)
importedObjects.append(ob)
Modified: branches/soc-2009-kazanbas/release/io/import_obj.py
===
--- branches/soc-2009-kazanbas/release/io/import_obj.py 2009-09-14 14:45:32 UTC
(rev 23221)
+++ branches/soc-2009-kazanbas/release/io/import_obj.py 2009-09-14 14:55:49 UTC
(rev 23222)
@@ -715,7 +715,7 @@
# face_mapping= me.faces.extend([f[0] for f in faces], indexList=True)
if verts_tex and me.faces:
- me.add_uv_layer()
+ me.add_uv_texture()
# me.faceUV= 1
# TEXMODE= Mesh.FaceModes['TEX']
Modified: branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_mesh.c
===
---
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23225] trunk/blender/source/blender/ editors/space_view3d: Smoke:
Revision: 23225
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23225
Author: genscher
Date: 2009-09-14 18:43:13 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Smoke:
* Introduce a better check for fragment support
Modified Paths:
--
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/drawvolume.c
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c
2009-09-14 16:30:53 UTC (rev 23224)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c
2009-09-14 16:43:13 UTC (rev 23225)
@@ -5360,7 +5360,7 @@
{
if(!smd-domain-wt || !(smd-domain-viewsettings
MOD_SMOKE_VIEW_SHOWBIG))
{
-// #if0
+// #if 0
smd-domain-tex = NULL;
GPU_create_smoke(smd, 0);
draw_volume(scene, ar, v3d, base,
smd-domain-tex, smd-domain-p0, smd-domain-p1, smd-domain-res,
smd-domain-dx, smd-domain-tex_shadow);
@@ -5395,7 +5395,7 @@
tmp[0] += smd-domain-dx * x +
smd-domain-dx * 0.5;
tmp[1] += smd-domain-dx * y +
smd-domain-dx * 0.5;
tmp[2] += smd-domain-dx * z +
smd-domain-dx * 0.5;
- color[0] = color[1] = color[2]
= 1.0; // density[index];
+ color[0] = color[1] = color[2]
= density[index];
glColor3fv(color);
bglVertex3fv(tmp);
}
Modified: trunk/blender/source/blender/editors/space_view3d/drawvolume.c
===
--- trunk/blender/source/blender/editors/space_view3d/drawvolume.c
2009-09-14 16:30:53 UTC (rev 23224)
+++ trunk/blender/source/blender/editors/space_view3d/drawvolume.c
2009-09-14 16:43:13 UTC (rev 23225)
@@ -328,10 +328,10 @@
// printf(i: %d\n, i);
- if(GLEW_ARB_fragment_program)
+if (GL_TRUE == glewIsSupported(GL_ARB_fragment_program))
{
+ glEnable(GL_FRAGMENT_PROGRAM_ARB);
glGenProgramsARB(1, prog);
- glEnable(GL_FRAGMENT_PROGRAM_ARB);
glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, prog);
glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB,
GL_PROGRAM_FORMAT_ASCII_ARB, (GLsizei)strlen(text), text);
@@ -342,7 +342,7 @@
glProgramLocalParameter4fARB (GL_FRAGMENT_PROGRAM_ARB, 1, 7.0,
7.0, 7.0, 1.0);
}
else
- printf(Your gfx card does not support 3dview smoke drawing.);
+ printf(Your gfx card does not support 3dview smoke
drawing.\n);
GPU_texture_bind(tex, 0);
if(tex_shadow)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23230] trunk/blender/source/blender: 2. 5 Bugfixes
Revision: 23230
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23230
Author: blendix
Date: 2009-09-14 21:12:29 +0200 (Mon, 14 Sep 2009)
Log Message:
---
2.5 Bugfixes
#19345: can't get out of grayed out pointer field.
#19342: item_pointerR fields can't be cleared with one item.
#19341: fix hanging tooltips when manipulating regions.
#19339: context panel still allowed tabbing, but it has no header.
#19334: editing SSS settings crashed previewrender.
#19330: object mode could not be switched on from the header menu.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/include/ED_screen.h
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_panel.c
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_graph/graph_buttons.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_logic/logic_buttons.c
trunk/blender/source/blender/editors/space_nla/nla_buttons.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_buttons.c
trunk/blender/source/blender/editors/space_text/text_header.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/sss.c
Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===
--- trunk/blender/source/blender/blenkernel/intern/material.c 2009-09-14
17:22:51 UTC (rev 23229)
+++ trunk/blender/source/blender/blenkernel/intern/material.c 2009-09-14
19:12:29 UTC (rev 23230)
@@ -159,9 +159,9 @@
ma-sss_radius[0]= 1.0f;
ma-sss_radius[1]= 1.0f;
ma-sss_radius[2]= 1.0f;
- ma-sss_col[0]= 0.8f;
- ma-sss_col[1]= 0.8f;
- ma-sss_col[2]= 0.8f;
+ ma-sss_col[0]= 1.0f;
+ ma-sss_col[1]= 1.0f;
+ ma-sss_col[2]= 1.0f;
ma-sss_error= 0.05f;
ma-sss_scale= 0.1f;
ma-sss_ior= 1.3f;
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2009-09-14
17:22:51 UTC (rev 23229)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-09-14
19:12:29 UTC (rev 23230)
@@ -4861,6 +4861,10 @@
QUATCOPY(rv3d-viewquat, v3d-viewquat);
}
}
+
+ /* this was not initialized correct always */
+ if(v3d-twtype == 0)
+ v3d-twtype= V3D_MANIP_TRANSLATE;
}
static void direct_link_screen(FileData *fd, bScreen *sc)
@@ -9687,6 +9691,11 @@
/* put 2.50 compatibility code here until next subversion bump */
{
+ Scene *sce;
+
+ for(sce = main-scene.first; sce; sce = sce-id.next)
+ if(sce-unit.scale_length == 0.0f)
+ sce-unit.scale_length= 1.0f;
}
/* WATCH IT!!!: pointers from libdata have not been converted yet here!
*/
Modified: trunk/blender/source/blender/editors/include/ED_screen.h
===
--- trunk/blender/source/blender/editors/include/ED_screen.h2009-09-14
17:22:51 UTC (rev 23229)
+++ trunk/blender/source/blender/editors/include/ED_screen.h2009-09-14
19:12:29 UTC (rev 23230)
@@ -58,6 +58,7 @@
void ED_region_panels(const struct bContext *C, struct ARegion *ar, int
vertical, char *context, int contextnr);
void ED_region_header_init(struct ARegion *ar);
void ED_region_header(const struct bContext *C, struct ARegion *ar);
+void ED_region_toggle_hidden(struct bContext *C, struct ARegion *ar);
void region_scissor_winrct(struct ARegion *ar, struct rcti *winrct);
/* spaces */
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===
--- trunk/blender/source/blender/editors/interface/interface_handlers.c
2009-09-14 17:22:51 UTC (rev 23229)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c
2009-09-14 19:12:29 UTC (rev 23230)
@@ -1440,16
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23231] trunk/blender/source/blender/ editors: 2.5 Bugfixes
Revision: 23231
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23231
Author: blendix
Date: 2009-09-14 21:49:40 +0200 (Mon, 14 Sep 2009)
Log Message:
---
2.5 Bugfixes
#19343: vertex paint blur was not working. shared vcol was disabled
for speed, but blurring still needs it. Also fixed brushes with
size 64 not working correct.
#19314: non-zbuffer selection did not work with background image,
drawing it made the WM matrix go out of sync.
Forgot to mention these in previous commit:
* Manipulator type was not properly initialized, .B.blend update helps,
but still needed version patch correct setting for new space.
* Added a utility function for the toggling region hide, instead of
duplicating the code.
* SSS preview render preprocessing pass now also uses multiple threads.
* Added version patch for unit scale, was still 0.0.
Modified Paths:
--
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
2009-09-14 19:12:29 UTC (rev 23230)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
2009-09-14 19:49:40 UTC (rev 23231)
@@ -710,7 +710,9 @@
if(totface+4=MAXINDEX) return 0;
- if(size64.0) size= 64.0;
+ /* brecht: disabled this because it obviously failes for
+ brushes with size 64, why is this here? */
+ /*if(size64.0) size= 64.0;*/
ibuf= view3d_read_backbuf(vc, x-size, y-size, x+size, y+size);
if(ibuf) {
@@ -1732,6 +1734,10 @@
}
Mat4SwapMat4(vc-rv3d-persmat, mat);
+
+ /* was disabled because it is slow, but necessary for blur */
+ if(vp-mode == VP_BLUR)
+ do_shared_vertexcol(me);
ED_region_tag_redraw(vc-ar);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
2009-09-14 19:12:29 UTC (rev 23230)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
2009-09-14 19:49:40 UTC (rev 23231)
@@ -1416,12 +1416,9 @@
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glMatrixMode(GL_PROJECTION);
- glPushMatrix();
- glMatrixMode(GL_MODELVIEW);
- glPushMatrix();
-
-// glaDefine2DArea(ar-winrct);
+ /* need to use wm push/pop matrix because ED_region_pixelspace
+ uses the wm functions too, otherwise gets out of sync */
+ wmPushMatrix();
ED_region_pixelspace(ar);
glEnable(GL_BLEND);
@@ -1433,10 +1430,7 @@
glPixelZoom(1.0, 1.0);
glPixelTransferf(GL_ALPHA_SCALE, 1.0f);
- glMatrixMode(GL_PROJECTION);
- glPopMatrix();
- glMatrixMode(GL_MODELVIEW);
- glPopMatrix();
+ wmPopMatrix();
glDisable(GL_BLEND);
if(v3d-zbuf) glEnable(GL_DEPTH_TEST);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23232] trunk/blender/intern/ghost/intern/ GHOST_WindowX11.cpp: Also set utf8 encoded hint for window title.
Revision: 23232
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23232
Author: gsrb3d
Date: 2009-09-14 22:17:56 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Also set utf8 encoded hint for window title.
Modified Paths:
--
trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2009-09-14
19:49:40 UTC (rev 23231)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2009-09-14
20:17:56 UTC (rev 23232)
@@ -294,7 +294,7 @@
}
// Create some hints for the window manager on how
- // we want this window treated.
+ // we want this window treated.
XSizeHints * xsizehints = XAllocSizeHints();
xsizehints-flags = USPosition | USSize;
@@ -514,7 +514,7 @@
getXWindow(
){
return m_window;
-}
+}
bool
GHOST_WindowX11::
@@ -528,7 +528,17 @@
setTitle(
const STR_String title
){
+ Atom name = XInternAtom(m_display, _NET_WM_NAME, 0);
+ Atom utf8str = XInternAtom(m_display, UTF8_STRING, 0);
+ XChangeProperty(m_display, m_window,
+ name, utf8str, 8, PropModeReplace,
+ (const unsigned char*) title.ReadPtr(),
+ strlen(title.ReadPtr()));
+
+// This should convert to valid x11 string
+// and getTitle would need matching change
XStoreName(m_display,m_window,title);
+
XFlush(m_display);
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23233] trunk/blender/source/blender: 2. 5 Bugfixes
Revision: 23233
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23233
Author: blendix
Date: 2009-09-14 22:48:05 +0200 (Mon, 14 Sep 2009)
Log Message:
---
2.5 Bugfixes
#19302: the spin operator did not redo correct when changing properties.
Actually the problem was somewhere else, the search menu always did an
unnecessary undo push, which conflicted with an operator undo push with
the same name. Only in the case of Spin was this noticed, because it's
name is so short and you actually type it completely.
#19328: swapping areas could crash when dragging mouse outside the window.
Attempted fix for #19331, #19335 as well, where backspace and some other
keys give square characters instead of working as expected. Couldn't
reproducable here, so please test.
Modified Paths:
--
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===
--- trunk/blender/source/blender/editors/include/UI_interface.h 2009-09-14
20:17:56 UTC (rev 23232)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2009-09-14
20:48:05 UTC (rev 23233)
@@ -146,6 +146,7 @@
#define UI_BUT_DRIVEN (122)
#define UI_BUT_INACTIVE(123)
#define UI_BUT_LAST_ACTIVE (124)
+#define UI_BUT_UNDO(125)
#define UI_PANEL_WIDTH 340
#define UI_COMPACT_PANEL_WIDTH 160
Modified: trunk/blender/source/blender/editors/interface/interface.c
===
--- trunk/blender/source/blender/editors/interface/interface.c 2009-09-14
20:17:56 UTC (rev 23232)
+++ trunk/blender/source/blender/editors/interface/interface.c 2009-09-14
20:48:05 UTC (rev 23233)
@@ -2264,6 +2264,9 @@
}
}
+ if(!ELEM7(but-type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, LISTBOX,
SEARCH_MENU))
+ but-flag |= UI_BUT_UNDO;
+
BLI_addtail(block-buttons, but);
if(block-curlayout)
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===
--- trunk/blender/source/blender/editors/interface/interface_handlers.c
2009-09-14 20:17:56 UTC (rev 23232)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c
2009-09-14 20:48:05 UTC (rev 23233)
@@ -292,8 +292,7 @@
uiAfterFunc *after;
char *str= NULL;
- if ELEM6(but-type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, LISTBOX);
- else {
+ if(but-flag UI_BUT_UNDO) {
/* define which string to use for undo */
if ELEM(but-type, LINK, INLINK) str= Add button link;
else if ELEM(but-type, MENU, ICONTEXTROW) str= but-drawstr;
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===
--- trunk/blender/source/blender/editors/interface/interface_layout.c
2009-09-14 20:17:56 UTC (rev 23232)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c
2009-09-14 20:48:05 UTC (rev 23233)
@@ -1107,7 +1107,7 @@
but-hardmax= MAX2(but-hardmax, 256);
but-rnasearchpoin= *searchptr;
but-rnasearchprop= searchprop;
- but-flag |= UI_ICON_LEFT|UI_TEXT_LEFT;
+ but-flag |= UI_ICON_LEFT|UI_TEXT_LEFT|UI_BUT_UNDO;
uiButSetSearchFunc(but, rna_search_cb, but, NULL, NULL);
}
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===
--- trunk/blender/source/blender/editors/screen/screen_ops.c2009-09-14
20:17:56 UTC (rev 23232)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c2009-09-14
20:48:05 UTC (rev 23233)
@@ -605,7 +605,7 @@
break;
case LEFTMOUSE: /* release LMB */
if(event-val==0) {
- if(sad-sa1 == sad-sa2) {
+ if(!sad-sa2 || sad-sa1 == sad-sa2) {
return area_swap_cancel(C, op);
}
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-09-14 20:17:56 UTC (rev 23232)
+++
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23234] trunk/blender/source/blender/ editors/space_view3d/drawvolume.c: Smoke:
Revision: 23234
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23234
Author: genscher
Date: 2009-09-14 23:55:48 +0200 (Mon, 14 Sep 2009)
Log Message:
---
Smoke:
* Fixing compile warning
Modified Paths:
--
trunk/blender/source/blender/editors/space_view3d/drawvolume.c
Modified: trunk/blender/source/blender/editors/space_view3d/drawvolume.c
===
--- trunk/blender/source/blender/editors/space_view3d/drawvolume.c
2009-09-14 20:48:05 UTC (rev 23233)
+++ trunk/blender/source/blender/editors/space_view3d/drawvolume.c
2009-09-14 21:55:48 UTC (rev 23234)
@@ -223,7 +223,7 @@
MUL temp.b, temp.b, shadow.r;\n
MOV result.color, temp;\n
END\n;
- unsigned int prog;
+ GLuint prog;
float size[3];
@@ -328,7 +328,7 @@
// printf(i: %d\n, i);
-if (GL_TRUE == glewIsSupported(GL_ARB_fragment_program))
+ if (GL_TRUE == glewIsSupported(GL_ARB_fragment_program))
{
glEnable(GL_FRAGMENT_PROGRAM_ARB);
glGenProgramsARB(1, prog);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23235] trunk/blender/source/blender/gpu/ intern/gpu_extensions.c: Smoke:
Revision: 23235 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23235 Author: genscher Date: 2009-09-15 00:27:10 +0200 (Tue, 15 Sep 2009) Log Message: --- Smoke: * Bugfix for non working 3dview Credits: Thanks to Wahooney, jesterKing and a big thanks to Matt/broken for hunting this down! Modified Paths: -- trunk/blender/source/blender/gpu/intern/gpu_extensions.c Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c === --- trunk/blender/source/blender/gpu/intern/gpu_extensions.c2009-09-14 21:55:48 UTC (rev 23234) +++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c2009-09-14 22:27:10 UTC (rev 23235) @@ -348,7 +348,7 @@ type = GL_FLOAT; // GL_UNSIGNED_BYTE format = GL_RED; - internalformat = GL_RED; + internalformat = GL_INTENSITY; //if (fpixels) // pixels = GPU_texture_convert_pixels(w*h*depth, fpixels); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23236] branches/blender2.4/source/blender /imbuf/intern/anim.c: Revert endianess test to 2.49 style.
Revision: 23236
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23236
Author: gsrb3d
Date: 2009-09-15 01:00:58 +0200 (Tue, 15 Sep 2009)
Log Message:
---
Revert endianess test to 2.49 style.
Reported by jms.
Modified Paths:
--
branches/blender2.4/source/blender/imbuf/intern/anim.c
Modified: branches/blender2.4/source/blender/imbuf/intern/anim.c
===
--- branches/blender2.4/source/blender/imbuf/intern/anim.c 2009-09-14
22:27:10 UTC (rev 23235)
+++ branches/blender2.4/source/blender/imbuf/intern/anim.c 2009-09-14
23:00:58 UTC (rev 23236)
@@ -779,7 +779,7 @@
}
}
- if (ENDIAN_ORDER == B_ENDIAN) {
+ if (G.order == B_ENDIAN) {
int * dstStride
= anim-pFrameRGB-linesize;
uint8_t** dst = anim-pFrameRGB-data;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23237] trunk/blender/source/blender: * Added RNA path functionality to fluidsim modifier settings, to allow keying of fluidsim settings properties.
Revision: 23237
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23237
Author: broken
Date: 2009-09-15 05:54:13 +0200 (Tue, 15 Sep 2009)
Log Message:
---
* Added RNA path functionality to fluidsim modifier settings, to allow keying
of fluidsim settings properties.
Note: Although the properties can be animated with the RNA system, the values
are not exported to the actual fluid sim yet, that can come later.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/fluidsim.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/makesdna/DNA_object_fluidsim.h
trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
Modified: trunk/blender/source/blender/blenkernel/intern/fluidsim.c
===
--- trunk/blender/source/blender/blenkernel/intern/fluidsim.c 2009-09-14
23:00:58 UTC (rev 23236)
+++ trunk/blender/source/blender/blenkernel/intern/fluidsim.c 2009-09-15
03:54:13 UTC (rev 23237)
@@ -80,6 +80,7 @@
if(!fss)
return;
+ fss-fmd = fluidmd;
fss-type = OB_FLUIDSIM_ENABLE;
fss-show_advancedoptions = 0;
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2009-09-14
23:00:58 UTC (rev 23236)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-09-15
03:54:13 UTC (rev 23237)
@@ -9692,10 +9692,23 @@
/* put 2.50 compatibility code here until next subversion bump */
{
Scene *sce;
+ Object *ob;
for(sce = main-scene.first; sce; sce = sce-id.next)
if(sce-unit.scale_length == 0.0f)
sce-unit.scale_length= 1.0f;
+
+ for(ob = main-object.first; ob; ob = ob-id.next) {
+ ModifierData *md;
+
+ /* add backwards pointer for fluidsim modifier RNA
access */
+ for (md=ob-modifiers.first; md; md = md-next) {
+ if (md-type == eModifierType_Fluidsim) {
+ FluidsimModifierData *fluidmd=
(FluidsimModifierData*) md;
+ fluidmd-fss-fmd = fluidmd;
+ }
+ }
+ }
}
/* WATCH IT!!!: pointers from libdata have not been converted yet here!
*/
Modified: trunk/blender/source/blender/makesdna/DNA_object_fluidsim.h
===
--- trunk/blender/source/blender/makesdna/DNA_object_fluidsim.h 2009-09-14
23:00:58 UTC (rev 23236)
+++ trunk/blender/source/blender/makesdna/DNA_object_fluidsim.h 2009-09-15
03:54:13 UTC (rev 23237)
@@ -41,6 +41,7 @@
struct MVert;
typedef struct FluidsimSettings {
+ struct FluidsimModifierData *fmd; /* for fast RNA access */
/* domain,fluid or obstacle */
short type;
/* display advanced options in fluid sim tab (on=1,off=0)*/
Modified: trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c 2009-09-14
23:00:58 UTC (rev 23236)
+++ trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c 2009-09-15
03:54:13 UTC (rev 23237)
@@ -151,6 +151,14 @@
return 32;
}
+static char *rna_FluidSettings_path(PointerRNA *ptr)
+{
+ FluidsimSettings *fss = (FluidsimSettings*)ptr-data;
+ ModifierData *md= (ModifierData *)fss-fmd;
+
+ return BLI_sprintfN(modifiers[%s].settings, md-name);
+}
+
#else
static void rna_def_fluidsim_slip(StructRNA *srna)
@@ -509,6 +517,7 @@
srna= RNA_def_struct(brna, FluidSettings, NULL);
RNA_def_struct_sdna(srna, FluidsimSettings);
RNA_def_struct_refine_func(srna, rna_FluidSettings_refine);
+ RNA_def_struct_path_func(srna, rna_FluidSettings_path);
RNA_def_struct_ui_text(srna, Fluid Simulation Settings, Fluid
simulation settings for an object taking part in the simulation.);
prop= RNA_def_property(srna, type, PROP_ENUM, PROP_NONE);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
