[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23089] branches/blender2.5/blender/source /blender/gpu/intern/Makefile: 2.5: fix compilation of smoke commit for Makesfiles as well.
Revision: 23089 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23089 Author: blendix Date: 2009-09-09 21:42:53 +0200 (Wed, 09 Sep 2009) Log Message: --- 2.5: fix compilation of smoke commit for Makesfiles as well. Modified Paths: -- branches/blender2.5/blender/source/blender/gpu/intern/Makefile Modified: branches/blender2.5/blender/source/blender/gpu/intern/Makefile === --- branches/blender2.5/blender/source/blender/gpu/intern/Makefile 2009-09-09 19:40:46 UTC (rev 23088) +++ branches/blender2.5/blender/source/blender/gpu/intern/Makefile 2009-09-09 19:42:53 UTC (rev 23089) @@ -47,6 +47,7 @@ CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../blenkernel +CPPFLAGS += -I$(NAN_SMOKE)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I../ ___ 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 [23093] branches/blender2.5/blender/source /blender/makesrna/intern/makesrna.c: RNA: fix for last commit, 0 size arrays are not very useful..
Revision: 23093
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23093
Author: blendix
Date: 2009-09-09 21:59:52 +0200 (Wed, 09 Sep 2009)
Log Message:
---
RNA: fix for last commit, 0 size arrays are not very useful..
Modified Paths:
--
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2009-09-09 19:52:10 UTC (rev 23092)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2009-09-09 19:59:52 UTC (rev 23093)
@@ -1679,7 +1679,7 @@
BooleanPropertyRNA *bprop=
(BooleanPropertyRNA*)prop;
unsigned int i;
- if(prop-arraydimension) {
+ if(prop-arraydimension
prop-totarraylength) {
fprintf(f, static int
rna_%s%s_%s_default[%d] = {, srna-identifier, strnest, prop-identifier,
prop-totarraylength);
for(i=0; iprop-totarraylength; i++) {
@@ -1699,7 +1699,7 @@
IntPropertyRNA *iprop= (IntPropertyRNA*)prop;
unsigned int i;
- if(prop-arraydimension) {
+ if(prop-arraydimension
prop-totarraylength) {
fprintf(f, static int
rna_%s%s_%s_default[%d] = {, srna-identifier, strnest, prop-identifier,
prop-totarraylength);
for(i=0; iprop-totarraylength; i++) {
@@ -1719,7 +1719,7 @@
FloatPropertyRNA *fprop=
(FloatPropertyRNA*)prop;
unsigned int i;
- if(prop-arraydimension) {
+ if(prop-arraydimension
prop-totarraylength) {
fprintf(f, static float
rna_%s%s_%s_default[%d] = {, srna-identifier, strnest, prop-identifier,
prop-totarraylength);
for(i=0; iprop-totarraylength; i++) {
@@ -1762,7 +1762,7 @@
case PROP_BOOLEAN: {
BooleanPropertyRNA *bprop=
(BooleanPropertyRNA*)prop;
fprintf(f, \t%s, %s, %s, %s, %d, ,
rna_function_string(bprop-get), rna_function_string(bprop-set),
rna_function_string(bprop-getarray), rna_function_string(bprop-setarray),
bprop-defaultvalue);
- if(prop-arraydimension) fprintf(f,
rna_%s%s_%s_default\n, srna-identifier, strnest, prop-identifier);
+ if(prop-arraydimension
prop-totarraylength) fprintf(f, rna_%s%s_%s_default\n, srna-identifier,
strnest, prop-identifier);
else fprintf(f, NULL\n);
break;
}
@@ -1775,7 +1775,7 @@
rna_int_print(f, iprop-hardmax); fprintf(f, ,
);
rna_int_print(f, iprop-step); fprintf(f, , );
rna_int_print(f, iprop-defaultvalue);
fprintf(f, , );
- if(prop-arraydimension) fprintf(f,
rna_%s%s_%s_default\n, srna-identifier, strnest, prop-identifier);
+ if(prop-arraydimension
prop-totarraylength) fprintf(f, rna_%s%s_%s_default\n, srna-identifier,
strnest, prop-identifier);
else fprintf(f, NULL\n);
break;
}
@@ -1789,7 +1789,7 @@
rna_float_print(f, fprop-step); fprintf(f, ,
);
rna_int_print(f, (int)fprop-precision);
fprintf(f, , );
rna_float_print(f, fprop-defaultvalue);
fprintf(f, , );
- if(prop-arraydimension) fprintf(f,
rna_%s%s_%s_default\n, srna-identifier, strnest, prop-identifier);
+ if(prop-arraydimension
prop-totarraylength) fprintf(f, rna_%s%s_%s_default\n, srna-identifier,
strnest, prop-identifier);
else fprintf(f, NULL\n);
break;
}
___
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 [23107] branches/blender2.5/blender/source /blender: 2.5: UV Edit
Revision: 23107
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23107
Author: blendix
Date: 2009-09-10 13:04:53 +0200 (Thu, 10 Sep 2009)
Log Message:
---
2.5: UV Edit
* Make mirror operator and menus work.
* Added TFM_OT_mirror transform operator specific for mirror.
* Assign image from image space when unwrapping in 3d view.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/transform/transform.c
branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c
Modified:
branches/blender2.5/blender/source/blender/editors/transform/transform.c
===
--- branches/blender2.5/blender/source/blender/editors/transform/transform.c
2009-09-10 10:35:51 UTC (rev 23106)
+++ branches/blender2.5/blender/source/blender/editors/transform/transform.c
2009-09-10 11:04:53 UTC (rev 23107)
@@ -1257,14 +1257,17 @@
int constraint_axis[3] = {0, 0, 0};
int proportional = 0;
- if (t-flag T_AUTOVALUES)
+ if (RNA_struct_find_property(op-ptr, value))
{
- RNA_float_set_array(op-ptr, value, t-auto_values);
+ if (t-flag T_AUTOVALUES)
+ {
+ RNA_float_set_array(op-ptr, value, t-auto_values);
+ }
+ else
+ {
+ RNA_float_set_array(op-ptr, value, t-values);
+ }
}
- else
- {
- RNA_float_set_array(op-ptr, value, t-values);
- }
/* XXX convert stupid flag to enum */
switch(t-flag (T_PROP_EDIT|T_PROP_CONNECTED))
@@ -4145,7 +4148,10 @@
recalcData(t);
- ED_area_headerprint(t-sa, Select a mirror axis (X, Y, Z));
+ if(t-flag T_2D_EDIT)
+ ED_area_headerprint(t-sa, Select a mirror axis (X,
Y));
+ else
+ ED_area_headerprint(t-sa, Select a mirror axis (X, Y,
Z));
}
return 1;
Modified:
branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
===
---
branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
2009-09-10 10:35:51 UTC (rev 23106)
+++
branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
2009-09-10 11:04:53 UTC (rev 23107)
@@ -98,6 +98,7 @@
char OP_SHRINK_FATTEN[] = TFM_OT_shrink_fatten;
char OP_TILT[] = TFM_OT_tilt;
char OP_TRACKBALL[] = TFM_OT_trackball;
+char OP_MIRROR[] = TFM_OT_mirror;
TransformModeItem transform_modes[] =
@@ -111,6 +112,7 @@
{OP_SHRINK_FATTEN, TFM_SHRINKFATTEN},
{OP_TILT, TFM_TILT},
{OP_TRACKBALL, TFM_TRACKBALL},
+ {OP_MIRROR, TFM_MIRROR},
{NULL, 0}
};
@@ -528,6 +530,25 @@
RNA_def_boolean(ot-srna, mirror, 0, Mirror Editing, );
}
+void TFM_OT_mirror(struct wmOperatorType *ot)
+{
+ /* identifiers */
+ ot-name = Mirror;
+ ot-description= Mirror selected vertices around one or more axes.;
+ ot-idname = OP_MIRROR;
+ ot-flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+
+ /* api callbacks */
+ ot-invoke = transform_invoke;
+ ot-exec = transform_exec;
+ ot-modal = transform_modal;
+ ot-cancel = transform_cancel;
+ ot-poll = ED_operator_areaactive;
+
+ Properties_Proportional(ot);
+ Properties_Constraints(ot);
+}
+
void TFM_OT_transform(struct wmOperatorType *ot)
{
static EnumPropertyItem transform_mode_types[] = {
@@ -595,6 +616,7 @@
WM_operatortype_append(TFM_OT_shrink_fatten);
WM_operatortype_append(TFM_OT_tilt);
WM_operatortype_append(TFM_OT_trackball);
+ WM_operatortype_append(TFM_OT_mirror);
WM_operatortype_append(TFM_OT_select_orientation);
}
@@ -699,8 +721,7 @@
km = WM_keymap_add_item(keymap, TFM_OT_resize, SKEY,
KM_PRESS, 0, 0);
- km = WM_keymap_add_item(keymap, TFM_OT_transform,
MKEY, KM_PRESS, 0, 0);
- RNA_int_set(km-ptr, mode, TFM_MIRROR);
+ km = WM_keymap_add_item(keymap, TFM_OT_mirror, MKEY,
KM_PRESS, 0, 0);
break;
default:
break;
Modified: branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
===
--- branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
2009-09-10 10:35:51 UTC (rev 23106)
+++
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23128] branches/blender2.5/blender/source /blender: 2.5: fix for merge, forward_diff_bezier needed to be updated.
Revision: 23128
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23128
Author: blendix
Date: 2009-09-11 16:56:54 +0200 (Fri, 11 Sep 2009)
Log Message:
---
2.5: fix for merge, forward_diff_bezier needed to be updated.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
branches/blender2.5/blender/source/blender/python/generic/Geometry.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
===
---
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
2009-09-11 14:31:05 UTC (rev 23127)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
2009-09-11 14:56:54 UTC (rev 23128)
@@ -1647,8 +1647,8 @@
vec[2][0]= vec[3][0]-dist;
vec[2][1]= vec[3][1];
- forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0],
coord_array[0], resol, 2);
- forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1],
coord_array[0]+1, resol, 2);
+ forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0],
coord_array[0], resol, sizeof(float)*2);
+ forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1],
coord_array[0]+1, resol, sizeof(float)*2);
return 1;
}
Modified:
branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
===
--- branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
2009-09-11 14:31:05 UTC (rev 23127)
+++ branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
2009-09-11 14:56:54 UTC (rev 23128)
@@ -675,8 +675,8 @@
correct_bezpart(v1, v2, v3, v4);
- forward_diff_bezier(v1[0], v2[0], v3[0], v4[0],
data, resol, 3);
- forward_diff_bezier(v1[1], v2[1], v3[1], v4[1],
data+1, resol, 3);
+ forward_diff_bezier(v1[0], v2[0], v3[0], v4[0],
data, resol, sizeof(float)*3);
+ forward_diff_bezier(v1[1], v2[1], v3[1], v4[1],
data+1, resol, sizeof(float)*3);
for (fp= data; resol; resol--, fp+= 3)
glVertex2fv(fp);
Modified:
branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
===
--- branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
2009-09-11 14:31:05 UTC (rev 23127)
+++ branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
2009-09-11 14:56:54 UTC (rev 23128)
@@ -2598,8 +2598,8 @@
else {
/* always do all three, to prevent data hanging around */
- forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0],
coord_array[0], resol, 2);
- forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1],
coord_array[0]+1, resol, 2);
+ forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0],
coord_array[0], resol, sizeof(float)*2);
+ forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1],
coord_array[0]+1, resol, sizeof(float)*2);
return 1;
}
Modified: branches/blender2.5/blender/source/blender/python/generic/Geometry.c
===
--- branches/blender2.5/blender/source/blender/python/generic/Geometry.c
2009-09-11 14:31:05 UTC (rev 23127)
+++ branches/blender2.5/blender/source/blender/python/generic/Geometry.c
2009-09-11 14:56:54 UTC (rev 23128)
@@ -523,7 +523,7 @@
coord_array = MEM_callocN(dims * (resolu) * sizeof(float),
BezierInterp);
for(i=0; idims; i++) {
- forward_diff_bezier(k1[i], h1[i], h2[i], k2[i], coord_array+i,
resolu-1, dims);
+ forward_diff_bezier(k1[i], h1[i], h2[i], k2[i], coord_array+i,
resolu-1, sizeof(float)*dims);
}
list= PyList_New(resolu);
___
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 [23132] branches/blender2.5/blender/source /blender/editors/screen/area.c: 2.5, Fix for bug #19296:
Revision: 23132
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23132
Author: blendix
Date: 2009-09-11 22:06:09 +0200 (Fri, 11 Sep 2009)
Log Message:
---
2.5, Fix for bug #19296:
render window escape incorrectly opens file browser.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/screen/area.c
Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===
--- branches/blender2.5/blender/source/blender/editors/screen/area.c
2009-09-11 18:31:51 UTC (rev 23131)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c
2009-09-11 20:06:09 UTC (rev 23132)
@@ -1034,7 +1034,12 @@
}
#endif
- ED_area_newspace(C, sa, sl-next-spacetype);
+ /* workaround for case of double prevspace, render window
+ with a file browser on top of it */
+ if(sl-next-spacetype == SPACE_FILE sl-next-next)
+ ED_area_newspace(C, sa, sl-next-next-spacetype);
+ else
+ ED_area_newspace(C, sa, sl-next-spacetype);
}
else {
ED_area_newspace(C, sa, SPACE_INFO);
___
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 [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 [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 [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 [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 [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 [23242] trunk/blender/release/ui/ space_view3d.py: UI: renamed 3dview menus to be lower case, not too important now,
Revision: 23242
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23242
Author: blendix
Date: 2009-09-15 12:23:44 +0200 (Tue, 15 Sep 2009)
Log Message:
---
UI: renamed 3dview menus to be lower case, not too important now,
but once these become extensible we need consistent names.
Modified Paths:
--
trunk/blender/release/ui/space_view3d.py
Modified: trunk/blender/release/ui/space_view3d.py
===
--- trunk/blender/release/ui/space_view3d.py2009-09-15 10:01:20 UTC (rev
23241)
+++ trunk/blender/release/ui/space_view3d.py2009-09-15 10:23:44 UTC (rev
23242)
@@ -25,17 +25,17 @@
# Select Menu
if mode_string not in ('EDIT_TEXT', 'SCULPT',
'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE'):
- sub.itemM(VIEW3D_MT_select_%s % mode_string)
+ sub.itemM(VIEW3D_MT_select_%s %
mode_string.lower())
if edit_object:
- sub.itemM(VIEW3D_MT_edit_%s %
edit_object.type)
+ sub.itemM(VIEW3D_MT_edit_%s %
edit_object.type.lower())
elif object:
ob_mode_string = object.mode
if mode_string not in ['PAINT_WEIGHT',
'PAINT_TEXTURE']:
- sub.itemM(VIEW3D_MT_%s % mode_string)
+ sub.itemM(VIEW3D_MT_%s %
mode_string.lower())
else:
- sub.itemM(VIEW3D_MT_OBJECT)
+ sub.itemM(VIEW3D_MT_object)
layout.template_header_3D()
@@ -155,7 +155,7 @@
# ** Select menus, suffix from context.mode **
-class VIEW3D_MT_select_OBJECT(bpy.types.Menu):
+class VIEW3D_MT_select_object(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = Select
@@ -174,7 +174,7 @@
layout.item_enumO(object.select_by_type, type, ,
text=Select All by Type...)
layout.itemO(object.select_grouped, text=Select Grouped...)
-class VIEW3D_MT_select_POSE(bpy.types.Menu):
+class VIEW3D_MT_select_pose(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = Select
@@ -205,7 +205,7 @@
props.extend = True
props.direction = 'CHILD'
-class VIEW3D_MT_select_PARTICLE(bpy.types.Menu):
+class VIEW3D_MT_select_particle(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = Select
@@ -224,7 +224,7 @@
layout.itemO(particle.select_more)
layout.itemO(particle.select_less)
-class VIEW3D_MT_select_EDIT_MESH(bpy.types.Menu):
+class VIEW3D_MT_select_edit_mesh(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = Select
@@ -268,7 +268,7 @@
layout.itemO(mesh.loop_to_region)
layout.itemO(mesh.region_to_loop)
-class VIEW3D_MT_select_EDIT_CURVE(bpy.types.Menu):
+class VIEW3D_MT_select_edit_curve(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = Select
@@ -297,7 +297,7 @@
layout.itemO(curve.select_more)
layout.itemO(curve.select_less)
-class VIEW3D_MT_select_EDIT_SURFACE(bpy.types.Menu):
+class VIEW3D_MT_select_edit_surface(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = Select
@@ -323,7 +323,7 @@
layout.itemO(curve.select_more)
layout.itemO(curve.select_less)
-class VIEW3D_MT_select_EDIT_METABALL(bpy.types.Menu):
+class VIEW3D_MT_select_edit_metaball(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = Select
@@ -341,7 +341,7 @@
layout.itemO(mball.select_random_metaelems)
-class VIEW3D_MT_select_EDIT_LATTICE(bpy.types.Menu):
+class VIEW3D_MT_select_edit_lattice(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = Select
@@ -354,7 +354,7 @@
layout.itemO(lattice.select_all_toggle, text=Select/Deselect
All)
-class VIEW3D_MT_select_EDIT_ARMATURE(bpy.types.Menu):
+class VIEW3D_MT_select_edit_armature(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = Select
@@ -383,7 +383,7 @@
props.extend = True
props.direction = 'CHILD'
-class VIEW3D_MT_select_FACE(bpy.types.Menu):# XXX no matching enum
+class VIEW3D_MT_select_face(bpy.types.Menu):# XXX no matching enum
__space_type__ = 'VIEW_3D'
__label__ = Select
@@ -394,7 +394,7 @@
# ** Object menu **
-class VIEW3D_MT_OBJECT(bpy.types.Menu):
+class VIEW3D_MT_object(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__context__ = objectmode
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23246] trunk/blender: 2.5: node group/ ungroup/edit operators, patch by Michal Ziulek,
Revision: 23246
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23246
Author: blendix
Date: 2009-09-15 13:35:10 +0200 (Tue, 15 Sep 2009)
Log Message:
---
2.5: node group/ungroup/edit operators, patch by Michal Ziulek,
with some small changes.
Modified Paths:
--
trunk/blender/release/ui/space_node.py
trunk/blender/source/blender/editors/space_node/node_draw.c
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
Modified: trunk/blender/release/ui/space_node.py
===
--- trunk/blender/release/ui/space_node.py 2009-09-15 10:59:42 UTC (rev
23245)
+++ trunk/blender/release/ui/space_node.py 2009-09-15 11:35:10 UTC (rev
23246)
@@ -98,11 +98,10 @@
# XXX
# layout.itemS()
# layout.itemO(node.make_link)
- # layout.itemS()
- # layout.itemO(node.edit_group)
- # layout.itemO(node.ungroup)
- # layout.itemO(node.group)
- # layout.itemO(node.make_link)
+ layout.itemS()
+ layout.itemO(node.group_edit)
+ layout.itemO(node.group_ungroup)
+ layout.itemO(node.group_make)
layout.itemS()
Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===
--- trunk/blender/source/blender/editors/space_node/node_draw.c 2009-09-15
10:59:42 UTC (rev 23245)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c 2009-09-15
11:35:10 UTC (rev 23246)
@@ -601,7 +601,7 @@
//addqueue(curarea-win, UI_BUT_EVENT,
B_NODE_TREE_EXEC);
}
else {
- node= snode_get_editgroup(snode);
+ node= node_tree_get_editgroup(snode-nodetree);
if(node)
NodeTagIDChanged(snode-nodetree,
node-id);
}
Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===
--- trunk/blender/source/blender/editors/space_node/node_edit.c 2009-09-15
10:59:42 UTC (rev 23245)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c 2009-09-15
11:35:10 UTC (rev 23246)
@@ -58,6 +58,7 @@
#include BKE_material.h
#include BKE_paint.h
#include BKE_texture.h
+#include BKE_report.h
#include BKE_scene.h
#include BKE_utildefines.h
@@ -84,6 +85,7 @@
#include WM_api.h
#include WM_types.h
+#include UI_interface.h
#include UI_view2d.h
#include node_intern.h
@@ -327,12 +329,12 @@
#endif /* 0 */
-bNode *snode_get_editgroup(SpaceNode *snode)
+bNode *node_tree_get_editgroup(bNodeTree *nodetree)
{
bNode *gnode;
/* get the groupnode */
- for(gnode= snode-nodetree-nodes.first; gnode; gnode= gnode-next)
+ for(gnode= nodetree-nodes.first; gnode; gnode= gnode-next)
if(gnode-flag NODE_GROUP_EDIT)
break;
return gnode;
@@ -441,7 +443,7 @@
addqueue(curarea-win, UI_BUT_EVENT,
B_NODE_TREE_EXEC);
}
else {
- node= snode_get_editgroup(snode);
+ node=
node_tree_get_editgroup(snode-nodetree);
if(node)
NodeTagIDChanged(snode-nodetree, node-id);
@@ -722,7 +724,7 @@
NodeTagChanged(snode-edittree, node);
/* if inside group, tag entire group */
- gnode= snode_get_editgroup(snode);
+ gnode=
node_tree_get_editgroup(snode-nodetree);
if(gnode)
NodeTagIDChanged(snode-nodetree, gnode-id);
@@ -753,6 +755,8 @@
#endif /* 0 */
}
+/* * Edit Group operator * */
+
void snode_make_group_editable(SpaceNode *snode, bNode *gnode)
{
bNode *node;
@@ -768,12 +772,9 @@
}
if(gnode gnode-type==NODE_GROUP gnode-id) {
- if(gnode-id-lib) {
- // XXX if(okee(Make Group Local))
- // ntreeMakeLocal((bNodeTree *)gnode-id);
- // else
- return;
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23273] trunk/blender/source/blender/nodes /intern/CMP_nodes/CMP_levels.c: 2.5: fix bug in Levels node, giving NULL pointer free warnings.
Revision: 23273 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23273 Author: blendix Date: 2009-09-16 16:45:10 +0200 (Wed, 16 Sep 2009) Log Message: --- 2.5: fix bug in Levels node, giving NULL pointer free warnings. Modified Paths: -- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_levels.c Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_levels.c === --- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_levels.c 2009-09-16 14:02:01 UTC (rev 23272) +++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_levels.c 2009-09-16 14:45:10 UTC (rev 23273) @@ -329,8 +329,8 @@ /* execfunc*/ node_composit_exec_view_levels, /* butfunc */ NULL, /* initfunc*/ node_composit_init_view_levels, - /* freestoragefunc*/node_free_standard_storage, - /* copystoragefunc*/node_copy_standard_storage, + /* freestoragefunc*/NULL, + /* copystoragefunc*/NULL, /* id */ NULL }; ___ 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 [23279] trunk/blender/source/blender: RNA
Revision: 23279
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23279
Author: blendix
Date: 2009-09-16 20:04:01 +0200 (Wed, 16 Sep 2009)
Log Message:
---
RNA
* PROP_NEVER_NULL is now a flag instead of a subtype.
* It works for function parameters too now, so setting
this flag can help avoid NULL checks in the function.
* Renamed LocalLamp to PointLamp, making it consistent
with the UI name.
* Set icons for the different lamp struct types.
Modified Paths:
--
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/RNA_types.h
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_brush.c
trunk/blender/source/blender/makesrna/intern/rna_define.c
trunk/blender/source/blender/makesrna/intern/rna_key.c
trunk/blender/source/blender/makesrna/intern/rna_lamp.c
trunk/blender/source/blender/makesrna/intern/rna_material.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
trunk/blender/source/blender/makesrna/intern/rna_pose.c
trunk/blender/source/blender/makesrna/intern/rna_rna.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_screen.c
trunk/blender/source/blender/makesrna/intern/rna_smoke.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_text.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/makesrna/intern/rna_world.c
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/source/blender/makesrna/RNA_access.h
===
--- trunk/blender/source/blender/makesrna/RNA_access.h 2009-09-16 17:43:09 UTC
(rev 23278)
+++ trunk/blender/source/blender/makesrna/RNA_access.h 2009-09-16 18:04:01 UTC
(rev 23279)
@@ -249,7 +249,6 @@
extern StructRNA RNA_LimitLocationConstraint;
extern StructRNA RNA_LimitRotationConstraint;
extern StructRNA RNA_LimitScaleConstraint;
-extern StructRNA RNA_LocalLamp;
extern StructRNA RNA_LockedTrackConstraint;
extern StructRNA RNA_MagicTexture;
extern StructRNA RNA_Main;
@@ -329,6 +328,7 @@
extern StructRNA RNA_PointDensity;
extern StructRNA RNA_PointDensityTexture;
extern StructRNA RNA_PointerProperty;
+extern StructRNA RNA_PointLamp;
extern StructRNA RNA_Pose;
extern StructRNA RNA_PoseChannel;
extern StructRNA RNA_Property;
Modified: trunk/blender/source/blender/makesrna/RNA_types.h
===
--- trunk/blender/source/blender/makesrna/RNA_types.h 2009-09-16 17:43:09 UTC
(rev 23278)
+++ trunk/blender/source/blender/makesrna/RNA_types.h 2009-09-16 18:04:01 UTC
(rev 23279)
@@ -110,9 +110,6 @@
PROP_XYZ = 28,
PROP_RGB = 29,
- /* pointers */
- PROP_NEVER_NULL = 30,
-
/* booleans */
PROP_LAYER = 40,
PROP_LAYER_MEMBER = 41
@@ -149,6 +146,7 @@
/* pointers */
PROP_ID_REFCOUNT = 64,
+ PROP_NEVER_NULL = 262144,
/* internal flags */
PROP_BUILTIN = 128,
Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===
--- trunk/blender/source/blender/makesrna/intern/makesrna.c 2009-09-16
17:43:09 UTC (rev 23278)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c 2009-09-16
18:04:01 UTC (rev 23279)
@@ -1419,7 +1419,6 @@
case PROP_ACCELERATION: return PROP_ACCELERATION;
case PROP_XYZ: return PROP_XYZ;
case PROP_RGB: return PROP_RGB;
- case PROP_NEVER_NULL: return PROP_NEVER_NULL;
case PROP_LAYER: return PROP_LAYER;
case PROP_LAYER_MEMBER: return PROP_LAYER_MEMBER;
default: {
Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_access.c 2009-09-16
17:43:09 UTC (rev 23278)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c 2009-09-16
18:04:01 UTC (rev 23279)
@@ -1409,10 +1409,17 @@
void RNA_property_pointer_set(PointerRNA *ptr, PropertyRNA *prop, PointerRNA
ptr_value)
{
- PointerPropertyRNA *pprop= (PointerPropertyRNA*)prop;
+ IDProperty *idprop;
- if(pprop-set)
- pprop-set(ptr, ptr_value);
+ if((idprop=rna_idproperty_check(prop, ptr))) {
+ /* not supported */
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23280] trunk/blender/source/blender/ editors/screen/screen_edit.c: UI: fix region edges cursor to show the right direction,
Revision: 23280
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23280
Author: blendix
Date: 2009-09-16 20:05:28 +0200 (Wed, 16 Sep 2009)
Log Message:
---
UI: fix region edges cursor to show the right direction,
was always vertical now.
Modified Paths:
--
trunk/blender/source/blender/editors/screen/screen_edit.c
Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===
--- trunk/blender/source/blender/editors/screen/screen_edit.c 2009-09-16
18:04:01 UTC (rev 23279)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c 2009-09-16
18:05:28 UTC (rev 23280)
@@ -1140,7 +1140,7 @@
if(az-type==AZONE_AREA)
WM_cursor_set(win, CURSOR_EDIT);
else if(az-type==AZONE_REGION) {
- if(az-x1==az-x2)
+ if(az-edge == 'l' || az-edge == 'r')
WM_cursor_set(win, CURSOR_X_MOVE);
else
WM_cursor_set(win, CURSOR_Y_MOVE);
___
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 [23281] trunk/blender/source/blender/ editors/space_file: File Browser
Revision: 23281
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23281
Author: blendix
Date: 2009-09-16 20:07:49 +0200 (Wed, 16 Sep 2009)
Log Message:
---
File Browser
* Fix warning for non-existing relative_paths property.
* Fix problem where the image browser would keep trying to
load images it failed opening.
Modified Paths:
--
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_file/filelist.c
Modified: trunk/blender/source/blender/editors/space_file/file_ops.c
===
--- trunk/blender/source/blender/editors/space_file/file_ops.c 2009-09-16
18:05:28 UTC (rev 23280)
+++ trunk/blender/source/blender/editors/space_file/file_ops.c 2009-09-16
18:07:49 UTC (rev 23281)
@@ -531,9 +531,10 @@
RNA_string_set(op-ptr, directory, name);
strcat(name, sfile-params-file);
- if ( RNA_boolean_get(op-ptr, relative_paths) ) {
- BLI_makestringcode(G.sce, name);
- }
+ if(RNA_struct_find_property(op-ptr, relative_paths))
+ if(RNA_boolean_get(op-ptr, relative_paths))
+ BLI_makestringcode(G.sce, name);
+
RNA_string_set(op-ptr, path, name);
/* some ops have multiple files to select */
Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===
--- trunk/blender/source/blender/editors/space_file/filelist.c 2009-09-16
18:05:28 UTC (rev 23280)
+++ trunk/blender/source/blender/editors/space_file/filelist.c 2009-09-16
18:07:49 UTC (rev 23281)
@@ -592,10 +592,12 @@
}
if (limg-done) {
FileImage *oimg = limg;
+ BLI_remove_thread(filelist-threads, oimg);
+ /* brecht: keep failed images in the list, otherwise
+ it keeps trying to load them over and over?
BLI_remlink(filelist-loadimages, oimg);
- BLI_remove_thread(filelist-threads, oimg);
+ MEM_freeN(oimg);*/
limg = oimg-next;
- MEM_freeN(oimg);
refresh = 1;
} else {
limg= limg-next;
___
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 [23284] trunk/blender/source/blender: UI: action editor header now also uses template for browsing action
Revision: 23284
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23284
Author: blendix
Date: 2009-09-16 20:32:10 +0200 (Wed, 16 Sep 2009)
Log Message:
---
UI: action editor header now also uses template for browsing action
datablocks, was last place using deprecated uiDefIDPoinButs.
Modified Paths:
--
trunk/blender/source/blender/editors/space_action/action_edit.c
trunk/blender/source/blender/editors/space_action/action_header.c
trunk/blender/source/blender/editors/space_action/action_intern.h
trunk/blender/source/blender/editors/space_action/action_ops.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
Modified: trunk/blender/source/blender/editors/space_action/action_edit.c
===
--- trunk/blender/source/blender/editors/space_action/action_edit.c
2009-09-16 18:32:03 UTC (rev 23283)
+++ trunk/blender/source/blender/editors/space_action/action_edit.c
2009-09-16 18:32:10 UTC (rev 23284)
@@ -1331,4 +1331,38 @@
RNA_def_enum(ot-srna, type, prop_actkeys_mirror_types, 0, Type,
);
}
+/* New Action Operator *** */
+
+static int act_new_exec(bContext *C, wmOperator *op)
+{
+ bAction *action;
+
+ // XXX need to restore behaviour to copy old actions...
+ action= add_empty_action(Action);
+
+ /* combined with RNA property, this will assign increase user,
+ so decrease here to compensate for that */
+ action-id.us--;
+
+ /* set notifier that keyframes have changed */
+ WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL);
+
+ return OPERATOR_FINISHED;
+}
+
+void ACT_OT_new (wmOperatorType *ot)
+{
+ /* identifiers */
+ ot-name= New;
+ ot-idname= ACT_OT_new;
+ ot-description= Create new action.;
+
+ /* api callbacks */
+ ot-exec= act_new_exec;
+ ot-poll= ED_operator_action_active;
+
+ /* flags */
+ ot-flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
/* **
*/
Modified: trunk/blender/source/blender/editors/space_action/action_header.c
===
--- trunk/blender/source/blender/editors/space_action/action_header.c
2009-09-16 18:32:03 UTC (rev 23283)
+++ trunk/blender/source/blender/editors/space_action/action_header.c
2009-09-16 18:32:10 UTC (rev 23284)
@@ -260,61 +260,6 @@
}
}
-static void saction_idpoin_handle(bContext *C, ID *id, int event)
-{
- SpaceAction *saction= CTX_wm_space_action(C);
- Object *obact= CTX_data_active_object(C);
-
- printf(actedit do id: \n);
-
- switch (event) {
- case UI_ID_BROWSE:
- printf(browse \n);
- case UI_ID_DELETE:
- printf(browse or delete \n);
- saction-action= (bAction*)id;
-
- /* we must set this action to be the one used by active
object (if not pinned) */
- if (saction-pin == 0) {
- AnimData *adt= BKE_id_add_animdata(obact-id);
/* this only adds if non-existant */
-
- /* set action */
- printf(\tset action \n);
- adt-action= saction-action;
- adt-action-id.us++;
- }
-
- ED_area_tag_redraw(CTX_wm_area(C));
- ED_undo_push(C, Assign Action);
- break;
- case UI_ID_RENAME:
- printf(actedit rename \n);
- break;
- case UI_ID_ADD_NEW:
- printf(actedit addnew \n);
- if (saction-pin == 0) {
- AnimData *adt= BKE_id_add_animdata(obact-id);
/* this only adds if non-existant */
-
- /* set new action */
- // XXX need to restore behaviour to copy old
actions...
- printf(\tset new action \n);
- adt-action= saction-action=
add_empty_action(Action);
- }
- break;
- case UI_ID_OPEN:
- printf(actedit open \n);
- /* XXX not implemented */
- break;
- case UI_ID_ALONE:
- printf(actedit alone \n);
- /* XXX not implemented */
- break;
- case UI_ID_PIN:
- printf(actedit pin \n);
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23285] trunk/blender: UI
Revision: 23285 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23285 Author: blendix Date: 2009-09-16 20:47:42 +0200 (Wed, 16 Sep 2009) Log Message: --- UI * Fix problem with curve mapping / color ramps not updating things like previews propertly. Now it uses the RNA update of the pointer from the material/texture/.. so each of those can define their own update, but still share the RNA struct. * Code for these templates is now in interface_templates.c * Fix exception for axis property, now it always shows normal widget with the PROP_DIRECTION subtype. * Remove context from uiBlockLayoutResolve, no longer needed. Modified Paths: -- trunk/blender/release/ui/buttons_data_lamp.py trunk/blender/release/ui/buttons_material.py trunk/blender/release/ui/buttons_scene.py trunk/blender/release/ui/buttons_texture.py trunk/blender/release/ui/space_userpref.py trunk/blender/release/ui/space_view3d_toolbar.py 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_intern.h trunk/blender/source/blender/editors/interface/interface_layout.c trunk/blender/source/blender/editors/interface/interface_regions.c trunk/blender/source/blender/editors/interface/interface_templates.c trunk/blender/source/blender/editors/screen/area.c trunk/blender/source/blender/editors/space_action/action_header.c trunk/blender/source/blender/makesrna/intern/rna_ui_api.c Modified: trunk/blender/release/ui/buttons_data_lamp.py === --- trunk/blender/release/ui/buttons_data_lamp.py 2009-09-16 18:32:10 UTC (rev 23284) +++ trunk/blender/release/ui/buttons_data_lamp.py 2009-09-16 18:47:42 UTC (rev 23285) @@ -301,7 +301,7 @@ def draw(self, context): lamp = context.lamp - self.layout.template_curve_mapping(lamp.falloff_curve) + self.layout.template_curve_mapping(lamp, falloff_curve) bpy.types.register(DATA_PT_context_lamp) bpy.types.register(DATA_PT_preview) Modified: trunk/blender/release/ui/buttons_material.py === --- trunk/blender/release/ui/buttons_material.py2009-09-16 18:32:10 UTC (rev 23284) +++ trunk/blender/release/ui/buttons_material.py2009-09-16 18:47:42 UTC (rev 23285) @@ -28,7 +28,7 @@ # this manages materials for all engine types engine = context.scene.render_data.engine - return (context.object) and (engine in self.COMPAT_ENGINES) + return (context.material or context.object) and (engine in self.COMPAT_ENGINES) def draw(self, context): layout = self.layout @@ -282,7 +282,7 @@ if mat.use_diffuse_ramp: layout.itemS() - layout.template_color_ramp(mat.diffuse_ramp, expand=True) + layout.template_color_ramp(mat, diffuse_ramp, expand=True) layout.itemS() row = layout.row() split = row.split(percentage=0.3) @@ -334,7 +334,7 @@ if mat.use_specular_ramp: layout.itemS() - layout.template_color_ramp(mat.specular_ramp, expand=True) + layout.template_color_ramp(mat, specular_ramp, expand=True) layout.itemS() row = layout.row() split = row.split(percentage=0.3) Modified: trunk/blender/release/ui/buttons_scene.py === --- trunk/blender/release/ui/buttons_scene.py 2009-09-16 18:32:10 UTC (rev 23284) +++ trunk/blender/release/ui/buttons_scene.py 2009-09-16 18:47:42 UTC (rev 23285) @@ -240,7 +240,8 @@ split = layout.split() col = split.column() - col.itemR(rd, exr_codec) + col.itemL(text=Codec:) + col.itemR(rd, exr_codec, text=) subsplit = split.split() col = subsplit.column() Modified: trunk/blender/release/ui/buttons_texture.py === --- trunk/blender/release/ui/buttons_texture.py 2009-09-16 18:32:10 UTC (rev 23284) +++ trunk/blender/release/ui/buttons_texture.py 2009-09-16 18:47:42 UTC (rev 23285) @@ -96,7 +96,7 @@ layout.itemR(tex, use_color_ramp, text=Ramp) if tex.use_color_ramp: -
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23286] trunk/blender/source/blender: UI
Revision: 23286
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23286
Author: blendix
Date: 2009-09-16 20:59:13 +0200 (Wed, 16 Sep 2009)
Log Message:
---
UI
* Node buttons can now use the layout engine. a few simple
ones are converted. We'll keep this code in C for now,
python wouldn't help much here.
* For node buttons not using the layout engine, manually
computing the button height is not longer needed.
* Node inputs are still not RNA wrapped, would be good to
have these available as well for keying, but makesrna does
not have access to the bNodeTypes.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/editors/include/ED_node.h
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/makesdna/DNA_node_types.h
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===
--- trunk/blender/source/blender/blenkernel/BKE_node.h 2009-09-16 18:47:42 UTC
(rev 23285)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h 2009-09-16 18:59:13 UTC
(rev 23286)
@@ -42,7 +42,7 @@
struct bNodeLink;
struct bNodeSocket;
struct bNodeStack;
-struct uiBlock;
+struct uiLayout;
struct rctf;
struct ListBase;
struct RenderData;
@@ -52,6 +52,7 @@
struct GPUMaterial;
struct GPUNode;
struct GPUNodeStack;
+struct PointerRNA;
/* ** NODE TYPE DEFINITIONS * */
@@ -82,7 +83,7 @@
void (*execfunc)(void *data, struct bNode *, struct bNodeStack **,
struct bNodeStack **);
/* this line is set on startup of blender */
- int (*butfunc)(struct uiBlock *, struct bNodeTree *, struct bNode *,
struct rctf *);
+ void (*uifunc)(struct uiLayout *, struct PointerRNA *ptr);
void (*initfunc)(struct bNode *);
void (*freestoragefunc)(struct bNode *);
Modified: trunk/blender/source/blender/editors/include/ED_node.h
===
--- trunk/blender/source/blender/editors/include/ED_node.h 2009-09-16
18:47:42 UTC (rev 23285)
+++ trunk/blender/source/blender/editors/include/ED_node.h 2009-09-16
18:59:13 UTC (rev 23286)
@@ -31,10 +31,15 @@
struct Material;
struct Scene;
struct Tex;
+struct bContext;
+struct bNode;
/* drawnode.c */
void ED_init_node_butfuncs(void);
+/* node_draw.c */
+void ED_node_changed_update(struct bContext *C, struct bNode *node);
+
/* node_edit.c */
void ED_node_shader_default(struct Material *ma);
void ED_node_composit_default(struct Scene *sce);
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2009-09-16
18:47:42 UTC (rev 23285)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2009-09-16
18:59:13 UTC (rev 23286)
@@ -170,9 +170,13 @@
/* ** BUTTON CALLBACKS FOR ALL TREES * */
-static int node_buts_group(uiBlock *block, bNodeTree *ntree, bNode *node, rctf
*butr)
+static void node_buts_group(uiLayout *layout, PointerRNA *ptr)
{
- if(block node-id) {
+ uiBlock *block= uiLayoutFreeBlock(layout);
+ bNode *node= ptr-data;
+ rctf *butr= node-butr;
+
+ if(node-id) {
uiBut *bt;
short width;
@@ -197,112 +201,95 @@
uiBlockEndAlign(block);
}
- return 19;
}
#endif
-static int node_buts_value(uiBlock *block, bNodeTree *ntree, bNode *node, rctf
*butr)
+static void node_buts_value(uiLayout *layout, PointerRNA *ptr)
{
- if(block) {
- bNodeSocket *sock= node-outputs.first; /* first socket
stores value */
-
- uiDefButF(block, NUM, B_NODE_EXEC, ,
- (short)butr-xmin, (short)butr-ymin,
butr-xmax-butr-xmin, 20,
- sock-ns.vec, sock-ns.min, sock-ns.max, 10,
2, );
-
- }
- return 20;
+ uiBlock *block= uiLayoutFreeBlock(layout);
+ bNode *node= ptr-data;
+ rctf *butr= node-butr;
+ bNodeSocket *sock= node-outputs.first; /* first socket stores
value */
+
+ uiDefButF(block, NUM, B_NODE_EXEC, ,
+ (short)butr-xmin, (short)butr-ymin,
butr-xmax-butr-xmin, 20,
+ sock-ns.vec, sock-ns.min, sock-ns.max, 10, 2, );
}
-static int node_buts_rgb(uiBlock *block, bNodeTree *ntree, bNode *node, rctf
*butr)
+static void node_buts_rgb(uiLayout *layout, PointerRNA *ptr)
{
- if(block)
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23287] trunk/blender: Image Panels
Revision: 23287 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23287 Author: blendix Date: 2009-09-16 21:27:08 +0200 (Wed, 16 Sep 2009) Log Message: --- Image Panels * The image panels in the image editor and texture buttons should be more complete now, with working new/open, refreshes, and using the layout engine. * Paint panels in image editor are now consistent with the ones in the 3d view toolbar. * Curves panel also uses layout engine, and doesn't look squashed anymore. Modified Paths: -- trunk/blender/release/ui/space_image.py trunk/blender/source/blender/blenkernel/intern/image.c trunk/blender/source/blender/blenkernel/intern/paint.c trunk/blender/source/blender/editors/include/ED_image.h trunk/blender/source/blender/editors/interface/interface_templates.c trunk/blender/source/blender/editors/space_image/image_buttons.c trunk/blender/source/blender/editors/space_image/image_ops.c trunk/blender/source/blender/editors/uvedit/uvedit_ops.c trunk/blender/source/blender/makesrna/intern/rna_color.c trunk/blender/source/blender/makesrna/intern/rna_image.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_ui_api.c Modified: trunk/blender/release/ui/space_image.py === --- trunk/blender/release/ui/space_image.py 2009-09-16 18:59:13 UTC (rev 23286) +++ trunk/blender/release/ui/space_image.py 2009-09-16 19:27:08 UTC (rev 23287) @@ -277,6 +277,24 @@ if show_uvedit or sima.image_painting: layout.itemR(sima, update_automatically, text=) +class IMAGE_PT_image_properties(bpy.types.Panel): + __space_type__ = 'IMAGE_EDITOR' + __region_type__ = 'UI' + __label__ = Image + + def poll(self, context): + sima = context.space_data + return (sima.image) + + def draw(self, context): + layout = self.layout + + sima = context.space_data + ima = sima.image + iuser = sima.image_user + + layout.template_image(sima, image, iuser, compact=True) + class IMAGE_PT_game_properties(bpy.types.Panel): __space_type__ = 'IMAGE_EDITOR' __region_type__ = 'UI' @@ -368,6 +386,92 @@ #col.itemR(uvedit, draw_edges) #col.itemR(uvedit, draw_faces) +class IMAGE_PT_paint(bpy.types.Panel): + __space_type__ = 'IMAGE_EDITOR' + __region_type__ = 'UI' + __label__ = Paint + + def poll(self, context): + sima = context.space_data + return sima.show_paint + + def draw(self, context): + layout = self.layout + + settings = context.tool_settings.image_paint + brush = settings.brush + + col = layout.split().column() + row = col.row() + row.template_list(settings, brushes, settings, active_brush_index, rows=2) + + col.template_ID(settings, brush, new=brush.add) + + row = layout.row(align=True) + row.item_enumR(settings, tool, 'DRAW') + row.item_enumR(settings, tool, 'SOFTEN') + row.item_enumR(settings, tool, 'CLONE') + row.item_enumR(settings, tool, 'SMEAR') + + col = layout.column() + col.itemR(brush, color, text=) + + row = col.row(align=True) + row.itemR(brush, size, slider=True) + row.itemR(brush, size_pressure, toggle=True, text=) + + row = col.row(align=True) + row.itemR(brush, strength, slider=True) + row.itemR(brush, strength_pressure, toggle=True, text=) + + col.itemR(brush, blend, text=Blend) + +class IMAGE_PT_paint_stroke(bpy.types.Panel): + __space_type__ = 'IMAGE_EDITOR' + __region_type__ = 'UI' + __label__ = Paint Stroke + __default_closed__ = True + + def poll(self, context): + sima = context.space_data + return sima.show_paint + + def draw(self, context): + layout = self.layout + + settings = context.tool_settings.image_paint + brush = settings.brush + + layout.itemR(brush, airbrush) + col = layout.column() + col.active = brush.airbrush + col.itemR(brush, rate, slider=True) + + layout.itemR(brush, space) + row = layout.row(align=True) + row.active = brush.space + row.itemR(brush, spacing, text=Distance, slider=True)
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23289] trunk/blender/source/blender/ editors: UI
Revision: 23289
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23289
Author: blendix
Date: 2009-09-16 21:36:17 +0200 (Wed, 16 Sep 2009)
Log Message:
---
UI
* Removed some legacy code which is not needed anymore now.
* Move some test_*poin_but functions to logic space code,
since that's the only place using it still.
* uiIconFromID now uses RNA info to lookup the icon, to avoid
code duplication, and means it works for more ID types.
Modified Paths:
--
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/interface_utils.c
trunk/blender/source/blender/editors/space_buttons/space_buttons.c
trunk/blender/source/blender/editors/space_graph/graph_buttons.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===
--- trunk/blender/source/blender/editors/include/UI_interface.h 2009-09-16
19:27:23 UTC (rev 23288)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2009-09-16
19:36:17 UTC (rev 23289)
@@ -418,7 +418,6 @@
uiBut *uiDefIDPoinBut(uiBlock *block, uiIDPoinFuncFP func, short blocktype,
int retval, char *str,
short x1, short y1, short x2,
short y2, void *idpp, char *tip);
-int uiDefIDPoinButs(uiBlock *block, struct Main *main, struct ID *parid,
struct ID *id, int id_code, short *pin_p, int x, int y, uiIDPoinFunc func, int
events);
int uiIconFromID(struct ID *id);
@@ -531,29 +530,6 @@
void UI_add_area_handlers(struct ListBase *handlers);
void UI_add_popup_handlers(struct bContext *C, struct ListBase *handlers,
uiPopupBlockHandle *menu);
-/* Legacy code
- * Callbacks and utils to get 2.48 work */
-
-void test_idbutton_cb(struct bContext *C, void *namev, void *arg2);
-void test_scriptpoin_but(struct bContext *C, char *name, struct ID **idpp);
-void test_actionpoin_but(struct bContext *C, char *name, struct ID **idpp);
-void test_obpoin_but(struct bContext *C, char *name, struct ID **idpp);
-void test_meshobpoin_but(struct bContext *C, char *name, struct ID **idpp);
-void test_meshpoin_but(struct bContext *C, char *name, struct ID **idpp);
-void test_matpoin_but(struct bContext *C, char *name, struct ID **idpp);
-void test_scenepoin_but(struct bContext *C, char *name, struct ID **idpp);
-void test_grouppoin_but(struct bContext *C, char *name, struct ID **idpp);
-void test_texpoin_but(struct bContext *C, char *name, struct ID **idpp);
-void test_imapoin_but(struct bContext *C, char *name, struct ID **idpp);
-void autocomplete_bone(struct bContext *C, char *str, void *arg_v);
-void autocomplete_vgroup(struct bContext *C, char *str, void *arg_v);
-
-struct rctf;
-void curvemap_buttons(uiBlock *block, struct CurveMapping *cumap, char
labeltype, short event, short redraw, struct rctf *rect);
-void curvemap_layout(uiLayout *layout, struct CurveMapping *cumap, char
labeltype, short event, short redraw, struct rctf *rect);
-void colorband_buttons(uiBlock *block, struct ColorBand *coba, struct rctf
*rect, int small);
-
-
/* Module
*
* init and exit should be called before using this module. init_userdef must
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===
--- trunk/blender/source/blender/editors/interface/interface_templates.c
2009-09-16 19:27:23 UTC (rev 23288)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c
2009-09-16 19:36:17 UTC (rev 23289)
@@ -762,6 +762,22 @@
}
}
+static void test_obpoin_but(bContext *C, char *name, ID **idpp)
+{
+ ID *id;
+
+ id= CTX_data_main(C)-object.first;
+ while(id) {
+ if( strcmp(name, id-name+2)==0 ) {
+ *idpp= id;
+ id_lib_extern(id); /* checks lib data, sets
correct flag for saving then */
+ return;
+ }
+ id= id-next;
+ }
+ *idpp= NULL;
+}
+
/* draw panel showing settings for a constraint */
static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint
*con)
{
@@ -956,11 +972,11 @@
/* subtarget */
if
(is_armature_target(ct-tar)) {
but=
uiDefBut(block, TEX, B_CONSTRAINT_CHANGETARGET, BO:, xco+120,
yco-(66+yoffset),150,18, ct-subtarget, 0, 24, 0, 0, Subtarget Bone);
-
uiButSetCompleteFunc(but, autocomplete_bone, (void *)ct-tar);
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23305] trunk/blender: UI: fix display of shape key list to show with no items,
Revision: 23305 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23305 Author: blendix Date: 2009-09-17 16:35:08 +0200 (Thu, 17 Sep 2009) Log Message: --- UI: fix display of shape key list to show with no items, list template should also accept None. Modified Paths: -- trunk/blender/release/ui/buttons_data_mesh.py trunk/blender/source/blender/makesrna/intern/rna_ui_api.c Modified: trunk/blender/release/ui/buttons_data_mesh.py === --- trunk/blender/release/ui/buttons_data_mesh.py 2009-09-17 13:47:58 UTC (rev 23304) +++ trunk/blender/release/ui/buttons_data_mesh.py 2009-09-17 14:35:08 UTC (rev 23305) @@ -102,8 +102,7 @@ kb = ob.active_shape_key row = layout.row() - if key: # XXX - looks crappy - row.template_list(key, keys, ob, active_shape_key_index, rows=2) + row.template_list(key, keys, ob, active_shape_key_index, rows=2) col = row.column() Modified: trunk/blender/source/blender/makesrna/intern/rna_ui_api.c === --- trunk/blender/source/blender/makesrna/intern/rna_ui_api.c 2009-09-17 13:47:58 UTC (rev 23304) +++ trunk/blender/source/blender/makesrna/intern/rna_ui_api.c 2009-09-17 14:35:08 UTC (rev 23305) @@ -301,7 +301,10 @@ func= RNA_def_function(srna, template_list, uiTemplateList); RNA_def_function_flag(func, FUNC_USE_CONTEXT); - api_ui_item_rna_common(func); + parm= RNA_def_pointer(func, data, AnyType, , Data from which to take property.); + RNA_def_property_flag(parm, PROP_REQUIRED|PROP_RNAPTR); + parm= RNA_def_string(func, property, , 0, , Identifier of property in data.); + RNA_def_property_flag(parm, PROP_REQUIRED); parm= RNA_def_pointer(func, active_data, AnyType, , Data from which to take property for the active element.); RNA_def_property_flag(parm, PROP_REQUIRED|PROP_RNAPTR|PROP_NEVER_NULL); parm= RNA_def_string(func, active_property, , 0, , Identifier of property in data, for the active element.); ___ 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 [23306] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Fix #19371: vertex group dropdown crash, own fault in commit yesterday.
Revision: 23306
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23306
Author: blendix
Date: 2009-09-17 16:37:08 +0200 (Thu, 17 Sep 2009)
Log Message:
---
Fix #19371: vertex group dropdown crash, own fault in commit yesterday.
Modified Paths:
--
trunk/blender/source/blender/editors/interface/interface_handlers.c
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===
--- trunk/blender/source/blender/editors/interface/interface_handlers.c
2009-09-17 14:35:08 UTC (rev 23305)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c
2009-09-17 14:37:08 UTC (rev 23306)
@@ -246,7 +246,7 @@
if(but-func || but-funcN || block-handle_func || but-rename_func ||
(but-type == BUTM block-butm_func) || but-optype || but-rnaprop) {
after= MEM_callocN(sizeof(uiAfterFunc), uiAfterFunc);
- if(ELEM(but, but-func_arg1, but-func_arg2)) {
+ if(but-func ELEM(but, but-func_arg1, but-func_arg2)) {
/* exception, this will crash due to removed button
otherwise */
but-func(C, but-func_arg1, but-func_arg2);
}
___
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 [23307] trunk/blender/source/blender: Warning fixes for blenkernel and editors.
Revision: 23307
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23307
Author: blendix
Date: 2009-09-17 16:46:22 +0200 (Thu, 17 Sep 2009)
Log Message:
---
Warning fixes for blenkernel and editors.
Note sure what to do with this one, and personally think
we should avoid using macros for this kind of thing:
V_GROW(edges);
source/blender/editors/mesh/loopcut.c:232: warning: value computed is not used
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/loopcut.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/physics/editparticle.c
trunk/blender/source/blender/editors/preview/previewrender.c
trunk/blender/source/blender/editors/space_image/image_draw.c
trunk/blender/source/blender/editors/space_view3d/drawvolume.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/makesrna/intern/rna_pose.c
trunk/blender/source/blender/render/intern/source/volumetric.c
Modified: trunk/blender/source/blender/blenkernel/intern/fcurve.c
===
--- trunk/blender/source/blender/blenkernel/intern/fcurve.c 2009-09-17
14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/blenkernel/intern/fcurve.c 2009-09-17
14:46:22 UTC (rev 23307)
@@ -1026,6 +1026,7 @@
}
}
+#if 0
static void berekenx (float *f, float *o, int b)
{
float t, c0, c1, c2, c3;
@@ -1041,6 +1042,7 @@
o[a]= c0 + t*c1 + t*t*c2 + t*t*t*c3;
}
}
+#endif
/* -- */
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2009-09-17
14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2009-09-17
14:46:22 UTC (rev 23307)
@@ -496,6 +496,7 @@
// SPARSE SYMMETRIC big matrix with 3x3 matrix entries
///
/* printf a big matrix on console: for debug output */
+#if 0
static void print_bfmatrix(fmatrix3x3 *m3)
{
unsigned int i = 0;
@@ -505,6 +506,8 @@
print_fmatrix(m3[i].m);
}
}
+#endif
+
/* create big matrix */
DO_INLINE fmatrix3x3 *create_bfmatrix(unsigned int verts, unsigned int springs)
{
@@ -1417,7 +1420,6 @@
int i = 0;
int j = 0;
int k = 0;
- lfVector temp;
INIT_MINMAX(gmin, gmax);
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2009-09-17
14:37:08 UTC (rev 23306)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2009-09-17
14:46:22 UTC (rev 23307)
@@ -8503,6 +8503,7 @@
mti-initData = smoothModifier_initData;
mti-copyData = smoothModifier_copyData;
mti-requiredDataMask = smoothModifier_requiredDataMask;
+ mti-isDisabled = smoothModifier_isDisabled;
mti-deformVerts = smoothModifier_deformVerts;
mti-deformVertsEM = smoothModifier_deformVertsEM;
@@ -8513,6 +8514,7 @@
mti-initData = castModifier_initData;
mti-copyData = castModifier_copyData;
mti-requiredDataMask = castModifier_requiredDataMask;
+ mti-isDisabled = castModifier_isDisabled;
mti-foreachObjectLink = castModifier_foreachObjectLink;
mti-updateDepgraph = castModifier_updateDepgraph;
mti-deformVerts = castModifier_deformVerts;
@@ -9137,19 +9139,6 @@
return i;
}
-static int modifiers_usesPointCache(Object *ob)
-{
- ModifierData *md = ob-modifiers.first;
-
- for (; md; md=md-next) {
- ModifierTypeInfo *mti = modifierType_getInfo(md-type);
- if (mti-flags eModifierTypeFlag_UsesPointCache) {
- return 1;
- }
- }
- return 0;
-}
-
void modifier_freeTemporaryData(ModifierData *md)
{
if(md-type == eModifierType_Armature) {
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23316] trunk/blender/source/blender: Keymaps now have a poll() function, rather than adding/removing
Revision: 23316
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23316
Author: blendix
Date: 2009-09-17 23:36:02 +0200 (Thu, 17 Sep 2009)
Log Message:
---
Keymaps now have a poll() function, rather than adding/removing
their handlers based on notifiers, which is simpler and more
reliable.
This fixes for example editmode or uv edit keymaps not working
when creating a new 3dview or image space.
Modified Paths:
--
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/animation/anim_ops.c
trunk/blender/source/blender/editors/armature/armature_ops.c
trunk/blender/source/blender/editors/curve/curve_ops.c
trunk/blender/source/blender/editors/gpencil/gpencil_ops.c
trunk/blender/source/blender/editors/include/ED_transform.h
trunk/blender/source/blender/editors/interface/view2d_ops.c
trunk/blender/source/blender/editors/mesh/mesh_ops.c
trunk/blender/source/blender/editors/metaball/mball_ops.c
trunk/blender/source/blender/editors/object/object_ops.c
trunk/blender/source/blender/editors/physics/ed_pointcache.c
trunk/blender/source/blender/editors/physics/editparticle.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_action/action_ops.c
trunk/blender/source/blender/editors/space_action/space_action.c
trunk/blender/source/blender/editors/space_buttons/space_buttons.c
trunk/blender/source/blender/editors/space_console/space_console.c
trunk/blender/source/blender/editors/space_file/space_file.c
trunk/blender/source/blender/editors/space_graph/graph_ops.c
trunk/blender/source/blender/editors/space_graph/space_graph.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_logic/space_logic.c
trunk/blender/source/blender/editors/space_nla/nla_ops.c
trunk/blender/source/blender/editors/space_nla/space_nla.c
trunk/blender/source/blender/editors/space_node/node_ops.c
trunk/blender/source/blender/editors/space_node/space_node.c
trunk/blender/source/blender/editors/space_outliner/outliner_ops.c
trunk/blender/source/blender/editors/space_outliner/space_outliner.c
trunk/blender/source/blender/editors/space_script/script_ops.c
trunk/blender/source/blender/editors/space_script/space_script.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c
trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c
trunk/blender/source/blender/editors/space_sound/space_sound.c
trunk/blender/source/blender/editors/space_text/space_text.c
trunk/blender/source/blender/editors/space_time/space_time.c
trunk/blender/source/blender/editors/space_time/time_ops.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
trunk/blender/source/blender/editors/transform/transform_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/makesdna/DNA_view3d_types.h
trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
trunk/blender/source/blender/windowmanager/wm_event_system.h
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2009-09-17
18:40:37 UTC (rev 23315)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-09-17
21:36:02 UTC (rev 23316)
@@ -4826,7 +4826,6 @@
rv3d-ri= NULL;
rv3d-sms= NULL;
rv3d-smooth_timer= NULL;
- rv3d-lastmode= 0;
}
}
Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c
2009-09-17 18:40:37 UTC (rev 23315)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c
2009-09-17 21:36:02 UTC (rev 23316)
@@ -1572,7 +1572,7 @@
void ED_keymap_animchannels(wmWindowManager *wm)
{
- ListBase *keymap = WM_keymap_listbase(wm, Animation_Channels, 0, 0);
+ wmKeyMap *keymap = WM_keymap_find(wm, Animation_Channels, 0, 0);
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23331] trunk/blender/source/blender: 2.5: Handlers are now evaluated in a different order, fixing some
Revision: 23331 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23331 Author: blendix Date: 2009-09-18 14:43:36 +0200 (Fri, 18 Sep 2009) Log Message: --- 2.5: Handlers are now evaluated in a different order, fixing some issues like Shift+R (repeat last) not giving capital R in the text editor. There is also new modal handler list at the window level, and the API call will always add it to that one now, since modal handlers were not used in other levels. The order used to be: * window modal + keymap * area modal + keymap * region modal + keymap Now it is: * window modal * region keymap * area keymap * window keymap Modified Paths: -- trunk/blender/source/blender/blenloader/intern/readfile.c trunk/blender/source/blender/editors/animation/anim_markers.c trunk/blender/source/blender/editors/animation/anim_ops.c trunk/blender/source/blender/editors/armature/editarmature_sketch.c trunk/blender/source/blender/editors/armature/poselib.c trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 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/interface/view2d_ops.c trunk/blender/source/blender/editors/mesh/loopcut.c trunk/blender/source/blender/editors/physics/editparticle.c trunk/blender/source/blender/editors/screen/screen_ops.c trunk/blender/source/blender/editors/sculpt_paint/paint_image.c trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c trunk/blender/source/blender/editors/sculpt_paint/sculpt.c trunk/blender/source/blender/editors/space_image/image_ops.c trunk/blender/source/blender/editors/space_node/node_edit.c trunk/blender/source/blender/editors/space_text/text_ops.c trunk/blender/source/blender/editors/space_view3d/view3d_edit.c trunk/blender/source/blender/editors/transform/transform_ops.c trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h trunk/blender/source/blender/windowmanager/WM_api.h trunk/blender/source/blender/windowmanager/intern/wm_event_system.c trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c trunk/blender/source/blender/windowmanager/intern/wm_operators.c trunk/blender/source/blender/windowmanager/intern/wm_window.c Modified: trunk/blender/source/blender/blenloader/intern/readfile.c === --- trunk/blender/source/blender/blenloader/intern/readfile.c 2009-09-18 11:25:52 UTC (rev 23330) +++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-09-18 12:43:36 UTC (rev 23331) @@ -4371,6 +4371,7 @@ win-timers.first= win-timers.last= NULL; win-queue.first= win-queue.last= NULL; win-handlers.first= win-handlers.last= NULL; + win-modalhandlers.first= win-modalhandlers.last= NULL; win-subwindows.first= win-subwindows.last= NULL; win-gesture.first= win-gesture.last= NULL; Modified: trunk/blender/source/blender/editors/animation/anim_markers.c === --- trunk/blender/source/blender/editors/animation/anim_markers.c 2009-09-18 11:25:52 UTC (rev 23330) +++ trunk/blender/source/blender/editors/animation/anim_markers.c 2009-09-18 12:43:36 UTC (rev 23331) @@ -458,7 +458,7 @@ mm-event_type= evt-type; /* add temp handler */ - WM_event_add_modal_handler(C, CTX_wm_window(C)-handlers, op); + WM_event_add_modal_handler(C, op); /* reset frs delta */ RNA_int_set(op-ptr, frames, 0); Modified: trunk/blender/source/blender/editors/animation/anim_ops.c === --- trunk/blender/source/blender/editors/animation/anim_ops.c 2009-09-18 11:25:52 UTC (rev 23330) +++ trunk/blender/source/blender/editors/animation/anim_ops.c 2009-09-18 12:43:36 UTC (rev 23331) @@ -162,7 +162,7 @@ change_frame_apply(C, op); /* add temp handler */ - WM_event_add_modal_handler(C, CTX_wm_window(C)-handlers, op); + WM_event_add_modal_handler(C, op); return OPERATOR_RUNNING_MODAL; } Modified: trunk/blender/source/blender/editors/armature/editarmature_sketch.c === --- trunk/blender/source/blender/editors/armature/editarmature_sketch.c 2009-09-18 11:25:52 UTC (rev 23330) +++ trunk/blender/source/blender/editors/armature/editarmature_sketch.c 2009-09-18 12:43:36 UTC (rev 23331) @@ -2618,7 +2618,7 @@
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23332] trunk/blender: 2.5: Python operators now have a working poll() function,
Revision: 23332
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23332
Author: blendix
Date: 2009-09-18 15:02:20 +0200 (Fri, 18 Sep 2009)
Log Message:
---
2.5: Python operators now have a working poll() function,
solved by wrapping all polling in WM_operator_poll and
adding a special callback for python.
Modified Paths:
--
trunk/blender/release/io/export_ply.py
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
trunk/blender/source/blender/python/intern/bpy_operator.c
trunk/blender/source/blender/python/intern/bpy_operator_wrap.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/release/io/export_ply.py
===
--- trunk/blender/release/io/export_ply.py 2009-09-18 12:43:36 UTC (rev
23331)
+++ trunk/blender/release/io/export_ply.py 2009-09-18 13:02:20 UTC (rev
23332)
@@ -250,7 +250,6 @@
]
def poll(self, context):
- print(Poll)
return context.active_object != None
def execute(self, context):
Modified: trunk/blender/source/blender/editors/interface/interface.c
===
--- trunk/blender/source/blender/editors/interface/interface.c 2009-09-18
12:43:36 UTC (rev 23331)
+++ trunk/blender/source/blender/editors/interface/interface.c 2009-09-18
13:02:20 UTC (rev 23332)
@@ -597,7 +597,7 @@
if(but-context)
CTX_store_set((bContext*)C, but-context);
- if(ot==NULL || (ot-poll ot-poll((bContext
*)C)==0)) {
+ if(ot == NULL || WM_operator_poll((bContext*)C, ot)==0)
{
but-flag |= UI_BUT_DISABLED;
but-lock = 1;
}
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===
--- trunk/blender/source/blender/editors/interface/interface_templates.c
2009-09-18 12:43:36 UTC (rev 23331)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c
2009-09-18 13:02:20 UTC (rev 23332)
@@ -2064,7 +2064,7 @@
for(; ot; ot= ot-next) {
if(BLI_strcasestr(ot-name, str)) {
- if(ot-poll==NULL || ot-poll((bContext *)C)) {
+ if(WM_operator_poll((bContext*)C, ot)) {
char name[256];
int len= strlen(ot-name);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
2009-09-18 12:43:36 UTC (rev 23331)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
2009-09-18 13:02:20 UTC (rev 23332)
@@ -163,7 +163,7 @@
if(op==NULL)
return;
- if(op-type-poll op-type-poll((bContext *)C)==0)
+ if(WM_operator_poll((bContext*)C, op-type) == 0)
return;
block= uiLayoutGetBlock(pa-layout);
@@ -208,7 +208,7 @@
for(; ot; ot= ot-next) {
if(BLI_strcasestr(ot-name, str)) {
- if(ot-poll==NULL || ot-poll((bContext *)C)) {
+ if(WM_operator_poll((bContext*)C, ot)) {
if(0==uiSearchItemAdd(items, ot-name, ot, 0))
break;
Modified: trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
===
--- trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
2009-09-18 12:43:36 UTC (rev 23331)
+++ trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
2009-09-18 13:02:20 UTC (rev 23332)
@@ -228,6 +228,7 @@
/* only used for operators defined with python
* use to store pointers to python functions */
void *pyop_data;
+ int (*pyop_poll)(struct bContext *, struct wmOperatorType *ot);
} wmOperatorType;
Modified: trunk/blender/source/blender/python/intern/bpy_operator.c
===
--- trunk/blender/source/blender/python/intern/bpy_operator.c 2009-09-18
12:43:36 UTC (rev 23331)
+++
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23333] trunk/blender/source/blender/ editors/space_image/image_ops.c: Fix #19383: crash pressing image open in texture buttons.
Revision: 2
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=2
Author: blendix
Date: 2009-09-18 15:13:28 +0200 (Fri, 18 Sep 2009)
Log Message:
---
Fix #19383: crash pressing image open in texture buttons.
Modified Paths:
--
trunk/blender/source/blender/editors/space_image/image_ops.c
Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===
--- trunk/blender/source/blender/editors/space_image/image_ops.c
2009-09-18 13:02:20 UTC (rev 23332)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c
2009-09-18 13:13:28 UTC (rev 2)
@@ -643,7 +643,7 @@
static int open_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
SpaceImage *sima= CTX_wm_space_image(C);
- char *path= (sima-image)? sima-image-name: U.textudir;
+ char *path= (sima sima-image)? sima-image-name: U.textudir;
if(RNA_property_is_set(op-ptr, path))
return open_exec(C, op);
___
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 [23334] trunk/blender/source/blender/ editors/sculpt_paint/sculpt.c: Fix #19381: Switching from sculpt to object mode does not update toolbar.
Revision: 23334 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23334 Author: blendix Date: 2009-09-18 15:17:33 +0200 (Fri, 18 Sep 2009) Log Message: --- Fix #19381: Switching from sculpt to object mode does not update toolbar. Modified Paths: -- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c === --- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2009-09-18 13:13:28 UTC (rev 2) +++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2009-09-18 13:17:33 UTC (rev 23334) @@ -1569,10 +1569,10 @@ paint_init(ts-sculpt-paint, PAINT_CURSOR_SCULPT); paint_cursor_start(C, sculpt_poll); - - WM_event_add_notifier(C, NC_SCENE|ND_MODE, CTX_data_scene(C)); } + WM_event_add_notifier(C, NC_SCENE|ND_MODE, CTX_data_scene(C)); + return OPERATOR_FINISHED; } ___ 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 [23336] trunk/blender/source/blender: Handlers/keymaps, some tweaks for previous commits:
Revision: 23336
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23336
Author: blendix
Date: 2009-09-18 17:48:49 +0200 (Fri, 18 Sep 2009)
Log Message:
---
Handlers/keymaps, some tweaks for previous commits:
* Screen keymap is now split up in two, some of the area/region
manipulation operators here need to be handled before others.
* Moved paint/sculpt/sketch out of the 3d view keymap, these were
there as a workaround, now with keymap poll no longer needed.
* Also fixes #19297, 3d cursor moves when combing in particle mode.
Modified Paths:
--
trunk/blender/source/blender/editors/armature/armature_ops.c
trunk/blender/source/blender/editors/include/ED_sculpt.h
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_intern.h
trunk/blender/source/blender/editors/space_api/spacetypes.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
Modified: trunk/blender/source/blender/editors/armature/armature_ops.c
===
--- trunk/blender/source/blender/editors/armature/armature_ops.c
2009-09-18 15:47:00 UTC (rev 23335)
+++ trunk/blender/source/blender/editors/armature/armature_ops.c
2009-09-18 15:48:49 UTC (rev 23336)
@@ -279,6 +279,15 @@
WM_keymap_add_item(keymap, SKETCH_OT_cancel_stroke, ESCKEY, KM_PRESS,
0, 0);
WM_keymap_add_item(keymap, SKETCH_OT_select, SELECTMOUSE, KM_PRESS,
0, 0);
+ /* sketch poll checks mode */
+ WM_keymap_add_item(keymap, SKETCH_OT_gesture, ACTIONMOUSE, KM_PRESS,
KM_SHIFT, 0);
+ WM_keymap_add_item(keymap, SKETCH_OT_draw_stroke, ACTIONMOUSE,
KM_PRESS, 0, 0);
+ kmi = WM_keymap_add_item(keymap, SKETCH_OT_draw_stroke, ACTIONMOUSE,
KM_PRESS, KM_CTRL, 0);
+ RNA_boolean_set(kmi-ptr, snap, 1);
+ WM_keymap_add_item(keymap, SKETCH_OT_draw_preview, MOUSEMOVE, KM_ANY,
0, 0);
+ kmi = WM_keymap_add_item(keymap, SKETCH_OT_draw_preview, MOUSEMOVE,
KM_ANY, KM_CTRL, 0);
+ RNA_boolean_set(kmi-ptr, snap, 1);
+
/* Pose */
/* only set in posemode, by space_view3d listener */
keymap= WM_keymap_find(wm, Pose, 0, 0);
Modified: trunk/blender/source/blender/editors/include/ED_sculpt.h
===
--- trunk/blender/source/blender/editors/include/ED_sculpt.h2009-09-18
15:47:00 UTC (rev 23335)
+++ trunk/blender/source/blender/editors/include/ED_sculpt.h2009-09-18
15:48:49 UTC (rev 23336)
@@ -33,10 +33,10 @@
/* sculpt.c */
void ED_operatortypes_sculpt(void);
-void ED_keymap_sculpt(struct wmWindowManager *wm);
/* paint_ops.c */
void ED_operatortypes_paint(void);
+void ED_keymap_paint(struct wmWindowManager *wm);
/* paint_image.c */
void undo_imagepaint_step(int step);
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===
--- trunk/blender/source/blender/editors/screen/screen_ops.c2009-09-18
15:47:00 UTC (rev 23335)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c2009-09-18
15:48:49 UTC (rev 23336)
@@ -3293,17 +3293,13 @@
{
wmKeyMap *keymap;
- /* Screen General */
- keymap= WM_keymap_find(wm, Screen, 0, 0);
+ /* Screen Editing */
+ keymap= WM_keymap_find(wm, Screen Editing, 0, 0);
-
- /* standard timers */
- WM_keymap_add_item(keymap, SCREEN_OT_animation_step, TIMER0, KM_ANY,
KM_ANY, 0);
-
RNA_int_set(WM_keymap_add_item(keymap, SCREEN_OT_actionzone,
LEFTMOUSE, KM_PRESS, 0, 0)-ptr, modifier, 0);
RNA_int_set(WM_keymap_add_item(keymap, SCREEN_OT_actionzone,
LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)-ptr, modifier, 1);
RNA_int_set(WM_keymap_add_item(keymap, SCREEN_OT_actionzone,
LEFTMOUSE, KM_PRESS, KM_ALT, 0)-ptr, modifier, 2);
-
+
/* screen tools */
WM_keymap_verify_item(keymap, SCREEN_OT_area_split,
EVT_ACTIONZONE_AREA, 0, 0, 0);
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23337] trunk/blender/release/ui: UI: fix some python errors in sculpt/paint modes when there is no brush.
Revision: 23337 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23337 Author: blendix Date: 2009-09-18 17:52:28 +0200 (Fri, 18 Sep 2009) Log Message: --- UI: fix some python errors in sculpt/paint modes when there is no brush. Modified Paths: -- trunk/blender/release/ui/space_image.py trunk/blender/release/ui/space_view3d_toolbar.py Modified: trunk/blender/release/ui/space_image.py === --- trunk/blender/release/ui/space_image.py 2009-09-18 15:48:49 UTC (rev 23336) +++ trunk/blender/release/ui/space_image.py 2009-09-18 15:52:28 UTC (rev 23337) @@ -419,22 +419,23 @@ row.item_enumR(settings, tool, 'CLONE') row.item_enumR(settings, tool, 'SMEAR') - col = layout.column() - col.itemR(brush, color, text=) + if brush: + col = layout.column() + col.itemR(brush, color, text=) - row = col.row(align=True) - row.itemR(brush, size, slider=True) - row.itemR(brush, use_size_pressure, toggle=True, text=) - - row = col.row(align=True) - row.itemR(brush, strength, slider=True) - row.itemR(brush, use_strength_pressure, toggle=True, text=) + row = col.row(align=True) + row.itemR(brush, size, slider=True) + row.itemR(brush, use_size_pressure, toggle=True, text=) + + row = col.row(align=True) + row.itemR(brush, strength, slider=True) + row.itemR(brush, use_strength_pressure, toggle=True, text=) - row = col.row(align=True) - row.itemR(brush, jitter, slider=True) - row.itemR(brush, use_jitter_pressure, toggle=True, text=) + row = col.row(align=True) + row.itemR(brush, jitter, slider=True) + row.itemR(brush, use_jitter_pressure, toggle=True, text=) - col.itemR(brush, blend, text=Blend) + col.itemR(brush, blend, text=Blend) class IMAGE_PT_paint_stroke(bpy.types.Panel): __space_type__ = 'IMAGE_EDITOR' @@ -444,7 +445,8 @@ def poll(self, context): sima = context.space_data - return sima.show_paint + settings = context.tool_settings.image_paint + return sima.show_paint and settings.brush def draw(self, context): layout = self.layout @@ -471,7 +473,8 @@ def poll(self, context): sima = context.space_data - return sima.show_paint + settings = context.tool_settings.image_paint + return sima.show_paint and settings.brush def draw(self, context): layout = self.layout Modified: trunk/blender/release/ui/space_view3d_toolbar.py === --- trunk/blender/release/ui/space_view3d_toolbar.py2009-09-18 15:48:49 UTC (rev 23336) +++ trunk/blender/release/ui/space_view3d_toolbar.py2009-09-18 15:52:28 UTC (rev 23337) @@ -379,7 +379,7 @@ # Sculpt Mode # - elif context.sculpt_object and settings.brush: + elif context.sculpt_object and brush: col = layout.column() col.itemS() col.itemR(brush, sculpt_tool, expand=True) @@ -412,7 +412,7 @@ # Texture Paint Mode # - elif context.texture_paint_object: + elif context.texture_paint_object and brush: col = layout.column(align=True) col.item_enumR(settings, tool, 'DRAW') col.item_enumR(settings, tool, 'SOFTEN') @@ -438,7 +438,7 @@ # Weight Paint Mode # - elif context.weight_paint_object: + elif context.weight_paint_object and brush: layout.itemR(context.tool_settings, vertex_group_weight, text=Weight, slider=True) col = layout.column() @@ -456,7 +456,7 @@ # Vertex Paint Mode # - elif context.vertex_paint_object: + elif context.vertex_paint_object and brush: col = layout.column() col.itemR(brush, color, text=) ___ 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 [23350] trunk/blender/source/blender/ makesrna/intern/rna_armature.c: RNA: for last commit, fix paths_location and paths_type enums,
Revision: 23350 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23350 Author: blendix Date: 2009-09-19 16:16:02 +0200 (Sat, 19 Sep 2009) Log Message: --- RNA: for last commit, fix paths_location and paths_type enums, these had wrong DNA variable name already before this change. Modified Paths: -- trunk/blender/source/blender/makesrna/intern/rna_armature.c Modified: trunk/blender/source/blender/makesrna/intern/rna_armature.c === --- trunk/blender/source/blender/makesrna/intern/rna_armature.c 2009-09-19 13:50:24 UTC (rev 23349) +++ trunk/blender/source/blender/makesrna/intern/rna_armature.c 2009-09-19 14:16:02 UTC (rev 23350) @@ -577,13 +577,13 @@ RNA_def_property_update(prop, 0, rna_Armature_redraw_data); prop= RNA_def_property(srna, paths_type, PROP_ENUM, PROP_NONE); - RNA_def_property_enum_bitflag_sdna(prop, NULL, flag); + RNA_def_property_enum_bitflag_sdna(prop, NULL, pathflag); RNA_def_property_enum_items(prop, prop_paths_type_items); RNA_def_property_ui_text(prop, Paths Type, Mapping type to use for this image in the game engine.); RNA_def_property_update(prop, 0, rna_Armature_redraw_data); prop= RNA_def_property(srna, paths_location, PROP_ENUM, PROP_NONE); - RNA_def_property_enum_bitflag_sdna(prop, NULL, flag); + RNA_def_property_enum_bitflag_sdna(prop, NULL, pathflag); RNA_def_property_enum_items(prop, prop_paths_location_items); RNA_def_property_ui_text(prop, Paths Location, When calculating Bone Paths, use Head or Tips); RNA_def_property_update(prop, 0, rna_Armature_redraw_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 [23351] trunk/blender/source/blender/ editors: Fix combined pose + weight paint mode, was using wrong object
Revision: 23351
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23351
Author: blendix
Date: 2009-09-19 17:48:47 +0200 (Sat, 19 Sep 2009)
Log Message:
---
Fix combined pose + weight paint mode, was using wrong object
in a few places, missing some checks.
Modified Paths:
--
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/space_view3d/drawarmature.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===
--- trunk/blender/source/blender/editors/armature/editarmature.c
2009-09-19 14:16:02 UTC (rev 23350)
+++ trunk/blender/source/blender/editors/armature/editarmature.c
2009-09-19 15:48:47 UTC (rev 23351)
@@ -4333,7 +4333,7 @@
}
/* in weightpaint we select the associated vertex group too */
- if (ob-mode OB_MODE_WEIGHT_PAINT) {
+ if (OBACT OBACT-mode OB_MODE_WEIGHT_PAINT) {
if (nearBone-flag BONE_ACTIVE) {
ED_vgroup_select_by_name(OBACT, nearBone-name);
DAG_id_flush_update(OBACT-id, OB_RECALC_DATA);
Modified: trunk/blender/source/blender/editors/space_view3d/drawarmature.c
===
--- trunk/blender/source/blender/editors/space_view3d/drawarmature.c
2009-09-19 14:16:02 UTC (rev 23350)
+++ trunk/blender/source/blender/editors/space_view3d/drawarmature.c
2009-09-19 15:48:47 UTC (rev 23351)
@@ -2513,7 +2513,11 @@
/* drawing posemode selection indices or colors only in
these cases */
if(!(base-flag OB_FROMDUPLI)) {
if(G.f G_PICKSEL) {
- if(ob-mode OB_MODE_POSE)
+ if(OBACT (OBACT-mode
OB_MODE_WEIGHT_PAINT)) {
+
if(ob==modifiers_isDeformedByArmature(OBACT))
+ arm-flag |=
ARM_POSEMODE;
+ }
+ else if(ob-mode OB_MODE_POSE)
arm-flag |= ARM_POSEMODE;
}
else if(ob-mode OB_MODE_POSE) {
@@ -2530,8 +2534,8 @@
if ((flag DRAW_SCENESET)==0) {
if(ob==OBACT)
arm-flag |=
ARM_POSEMODE;
- else if(ob-mode
OB_MODE_WEIGHT_PAINT) {
- if(OBACT
ob==modifiers_isDeformedByArmature(OBACT))
+ else if(OBACT (OBACT-mode
OB_MODE_WEIGHT_PAINT)) {
+
if(ob==modifiers_isDeformedByArmature(OBACT))
arm-flag |=
ARM_POSEMODE;
}
draw_pose_paths(scene, v3d,
rv3d, ob);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_select.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_select.c
2009-09-19 14:16:02 UTC (rev 23350)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c
2009-09-19 15:48:47 UTC (rev 23351)
@@ -1148,7 +1148,7 @@
WM_event_add_notifier(C,
NC_OBJECT|ND_BONE_ACTIVE, basact-object);
/* in weightpaint, we use selected bone
to select vertexgroup, so no switch to new active object */
- if(basact-object-mode
OB_MODE_WEIGHT_PAINT) {
+ if(BASACT BASACT-object-mode
OB_MODE_WEIGHT_PAINT) {
/* prevent activating */
basact= NULL;
}
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===
--- trunk/blender/source/blender/editors/transform/transform_conversions.c
2009-09-19 14:16:02 UTC (rev 23350)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c
2009-09-19 15:48:47 UTC (rev 23351)
@@ -5289,7 +5289,7 @@
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23353] trunk/blender: Bone constraints are now in a separate tab.
Revision: 23353 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23353 Author: blendix Date: 2009-09-19 21:40:38 +0200 (Sat, 19 Sep 2009) Log Message: --- Bone constraints are now in a separate tab. It's more consistent since object constraints also have their own tab, and I didn't want to break context going from left to right. Modified Paths: -- trunk/blender/release/ui/buttons_data_bone.py trunk/blender/release/ui/buttons_object_constraint.py trunk/blender/source/blender/editors/space_buttons/buttons_context.c trunk/blender/source/blender/editors/space_buttons/buttons_header.c trunk/blender/source/blender/editors/space_buttons/space_buttons.c trunk/blender/source/blender/makesdna/DNA_space_types.h trunk/blender/source/blender/makesrna/intern/rna_space.c Modified: trunk/blender/release/ui/buttons_data_bone.py === --- trunk/blender/release/ui/buttons_data_bone.py 2009-09-19 18:45:31 UTC (rev 23352) +++ trunk/blender/release/ui/buttons_data_bone.py 2009-09-19 19:40:38 UTC (rev 23353) @@ -74,6 +74,7 @@ class BONE_PT_transform_locks(BoneButtonsPanel): __label__ = Transform Locks + __default_closed__ = True def poll(self, context): return context.bone Modified: trunk/blender/release/ui/buttons_object_constraint.py === --- trunk/blender/release/ui/buttons_object_constraint.py 2009-09-19 18:45:31 UTC (rev 23352) +++ trunk/blender/release/ui/buttons_object_constraint.py 2009-09-19 19:40:38 UTC (rev 23353) @@ -513,7 +513,7 @@ class BONE_PT_constraints(ConstraintButtonsPanel): __label__ = Constraints - __context__ = bone + __context__ = bone_constraint def poll(self, context): ob = context.object Modified: trunk/blender/source/blender/editors/space_buttons/buttons_context.c === --- trunk/blender/source/blender/editors/space_buttons/buttons_context.c 2009-09-19 18:45:31 UTC (rev 23352) +++ trunk/blender/source/blender/editors/space_buttons/buttons_context.c 2009-09-19 19:40:38 UTC (rev 23353) @@ -463,6 +463,7 @@ found= buttons_context_path_texture(C, path); break; case BCONTEXT_BONE: + case BCONTEXT_BONE_CONSTRAINT: found= buttons_context_path_bone(path); if(!found) found= buttons_context_path_data(path, OB_ARMATURE); Modified: trunk/blender/source/blender/editors/space_buttons/buttons_header.c === --- trunk/blender/source/blender/editors/space_buttons/buttons_header.c 2009-09-19 18:45:31 UTC (rev 23352) +++ trunk/blender/source/blender/editors/space_buttons/buttons_header.c 2009-09-19 19:40:38 UTC (rev 23353) @@ -114,13 +114,15 @@ if(sbuts-pathflag (1BCONTEXT_OBJECT)) uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_OBJECT_DATA, xco+=BUTS_UI_UNIT, yco, BUTS_UI_UNIT, BUTS_UI_UNIT, (sbuts-mainb), 0.0, (float)BCONTEXT_OBJECT, 0, 0, Object); if(sbuts-pathflag (1BCONTEXT_CONSTRAINT)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_CONSTRAINT,xco+=BUTS_UI_UNIT, yco, BUTS_UI_UNIT, BUTS_UI_UNIT, (sbuts-mainb), 0.0, (float)BCONTEXT_CONSTRAINT, 0, 0, Constraint); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_CONSTRAINT,xco+=BUTS_UI_UNIT, yco, BUTS_UI_UNIT, BUTS_UI_UNIT, (sbuts-mainb), 0.0, (float)BCONTEXT_CONSTRAINT, 0, 0, Object Constraints); if(sbuts-pathflag (1BCONTEXT_DATA)) uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, sbuts-dataicon,xco+=BUTS_UI_UNIT, yco, BUTS_UI_UNIT, BUTS_UI_UNIT, (sbuts-mainb), 0.0, (float)BCONTEXT_DATA, 0, 0, Object Data); if(sbuts-pathflag (1BCONTEXT_MODIFIER)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_MODIFIER, xco+=BUTS_UI_UNIT, yco, BUTS_UI_UNIT, BUTS_UI_UNIT, (sbuts-mainb), 0.0, (float)BCONTEXT_MODIFIER, 0, 0, Modifier); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_MODIFIER, xco+=BUTS_UI_UNIT, yco, BUTS_UI_UNIT, BUTS_UI_UNIT, (sbuts-mainb), 0.0, (float)BCONTEXT_MODIFIER, 0, 0, Modifiers); if(sbuts-pathflag (1BCONTEXT_BONE)) uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_BONE_DATA, xco+=BUTS_UI_UNIT, yco, BUTS_UI_UNIT, BUTS_UI_UNIT, (sbuts-mainb), 0.0, (float)BCONTEXT_BONE, 0, 0, Bone); + if(sbuts-pathflag (1BCONTEXT_BONE_CONSTRAINT)) + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_CONSTRAINT,xco+=BUTS_UI_UNIT, yco,
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23389] trunk/blender: Fix #19389: add lamp had no submenu to choose the type.
Revision: 23389
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23389
Author: blendix
Date: 2009-09-21 12:54:15 +0200 (Mon, 21 Sep 2009)
Log Message:
---
Fix #19389: add lamp had no submenu to choose the type.
Modified Paths:
--
trunk/blender/release/ui/space_info.py
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_intern.h
trunk/blender/source/blender/editors/object/object_ops.c
Modified: trunk/blender/release/ui/space_info.py
===
--- trunk/blender/release/ui/space_info.py 2009-09-21 09:17:14 UTC (rev
23388)
+++ trunk/blender/release/ui/space_info.py 2009-09-21 10:54:15 UTC (rev
23389)
@@ -124,7 +124,7 @@
layout.item_menu_enumO(object.mesh_add, type, text=Mesh,
icon='ICON_OUTLINER_OB_MESH')
layout.item_menu_enumO(object.curve_add, type,
text=Curve, icon='ICON_OUTLINER_OB_CURVE')
layout.item_menu_enumO(object.surface_add, type,
text=Surface, icon='ICON_OUTLINER_OB_SURFACE')
- layout.item_menu_enumO(object.metaball_add, type, 'META',
icon='ICON_OUTLINER_OB_META')
+ layout.item_menu_enumO(object.metaball_add, type, 'META',
text=Metaball, icon='ICON_OUTLINER_OB_META')
layout.itemO(object.text_add, text=Text,
icon='ICON_OUTLINER_OB_FONT')
layout.itemS()
@@ -136,7 +136,7 @@
layout.itemS()
layout.item_enumO(object.add, type, 'CAMERA',
icon='ICON_OUTLINER_OB_CAMERA')
- layout.item_enumO(object.add, type, 'LAMP',
icon='ICON_OUTLINER_OB_LAMP')
+ layout.item_menu_enumO(object.lamp_add, type, 'LAMP',
text=Lamp, icon='ICON_OUTLINER_OB_LAMP')
class INFO_MT_game(bpy.types.Menu):
__space_type__ = 'INFO'
Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===
--- trunk/blender/source/blender/editors/interface/interface_regions.c
2009-09-21 09:17:14 UTC (rev 23388)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c
2009-09-21 10:54:15 UTC (rev 23389)
@@ -2226,7 +2226,7 @@
}
block-minbounds= minwidth;
- uiTextBoundsBlock(block, 40);
+ uiTextBoundsBlock(block, 50);
}
/* if menu slides out of other menu, override direction */
Modified: trunk/blender/source/blender/editors/object/object_add.c
===
--- trunk/blender/source/blender/editors/object/object_add.c2009-09-21
09:17:14 UTC (rev 23388)
+++ trunk/blender/source/blender/editors/object/object_add.c2009-09-21
10:54:15 UTC (rev 23389)
@@ -32,6 +32,7 @@
#include DNA_action_types.h
#include DNA_curve_types.h
#include DNA_group_types.h
+#include DNA_lamp_types.h
#include DNA_material_types.h
#include DNA_mesh_types.h
#include DNA_meta_types.h
@@ -165,7 +166,7 @@
/* for object add operator */
static int object_add_exec(bContext *C, wmOperator *op)
{
- object_add_type(C, RNA_int_get(op-ptr, type));
+ object_add_type(C, RNA_enum_get(op-ptr, type));
return OPERATOR_FINISHED;
}
@@ -467,7 +468,7 @@
void OBJECT_OT_metaball_add(wmOperatorType *ot)
{
/* identifiers */
- ot-name= Metaball;
+ ot-name= Add Metaball;
ot-description= Add an metaball object to the scene.;
ot-idname= OBJECT_OT_metaball_add;
@@ -559,6 +560,45 @@
ot-flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
+static int object_lamp_add_exec(bContext *C, wmOperator *op)
+{
+ Object *ob;
+ int type= RNA_enum_get(op-ptr, type);
+
+ ob= object_add_type(C, OB_LAMP);
+ if(ob ob-data)
+ ((Lamp*)ob-data)-type= type;
+
+ return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_lamp_add(wmOperatorType *ot)
+{
+ static EnumPropertyItem lamp_type_items[] = {
+ {LA_LOCAL, POINT, ICON_LAMP_POINT, Point, Omnidirectional
point light source.},
+ {LA_SUN, SUN, ICON_LAMP_SUN, Sun, Constant direction
parallel ray light source.},
+ {LA_SPOT, SPOT, ICON_LAMP_SPOT, Spot, Directional cone
light source.},
+ {LA_HEMI, HEMI, ICON_LAMP_HEMI, Hemi, 180 degree constant
light source.},
+ {LA_AREA, AREA, ICON_LAMP_AREA, Area, Directional area
light source.},
+ {0, NULL, 0, NULL, NULL}};
+
+ /* identifiers */
+ ot-name= Add Lamp;
+ ot-description = Add a lamp object to the scene.;
+ ot-idname= OBJECT_OT_lamp_add;
+
+ /* api callbacks */
+ ot-invoke= WM_menu_invoke;
+ ot-exec= object_lamp_add_exec;
+ ot-poll= ED_operator_scene_editable;
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23394] trunk/blender/source/blender: Fix #19418: file browse button for strip filename did not work,
Revision: 23394
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23394
Author: blendix
Date: 2009-09-21 15:23:47 +0200 (Mon, 21 Sep 2009)
Log Message:
---
Fix #19418: file browse button for strip filename did not work,
sequence RNA now also splits up directory and filename automatic.
Modified Paths:
--
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/makesrna/intern/rna_sequence.c
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===
--- trunk/blender/source/blender/editors/interface/interface_layout.c
2009-09-21 12:29:53 UTC (rev 23393)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c
2009-09-21 13:23:47 UTC (rev 23394)
@@ -533,7 +533,7 @@
prevbut= but-prev;
/* find the button before the active one */
- if((but-flag UI_BUT_LAST_ACTIVE) prevbut
prevbut-rnapoin.id.data) {
+ if((but-flag UI_BUT_LAST_ACTIVE) prevbut
prevbut-rnapoin.data) {
if(RNA_property_type(prevbut-rnaprop) ==
PROP_STRING) {
*ptr= prevbut-rnapoin;
*prop= prevbut-rnaprop;
Modified: trunk/blender/source/blender/makesrna/intern/rna_sequence.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_sequence.c 2009-09-21
12:29:53 UTC (rev 23393)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequence.c 2009-09-21
13:23:47 UTC (rev 23394)
@@ -239,6 +239,35 @@
return rna_pointer_inherit_refine(iter-parent, RNA_Sequence,
ms-parseq);
}
+static void rna_MovieSequence_filename_set(PointerRNA *ptr, const char *value)
+{
+ Sequence *seq= (Sequence*)(ptr-data);
+ char dir[FILE_MAX], name[FILE_MAX];
+
+ BLI_split_dirfile_basic(value, dir, name);
+ BLI_strncpy(seq-strip-dir, dir, sizeof(seq-strip-dir));
+ BLI_strncpy(seq-strip-stripdata-name, name,
sizeof(seq-strip-stripdata-name));
+}
+
+static void rna_SoundSequence_filename_set(PointerRNA *ptr, const char *value)
+{
+ Sequence *seq= (Sequence*)(ptr-data);
+ char dir[FILE_MAX], name[FILE_MAX];
+
+ BLI_split_dirfile_basic(value, dir, name);
+ BLI_strncpy(seq-strip-dir, dir, sizeof(seq-strip-dir));
+ BLI_strncpy(seq-strip-stripdata-name, name,
sizeof(seq-strip-stripdata-name));
+}
+
+static void rna_SequenceElement_filename_set(PointerRNA *ptr, const char
*value)
+{
+ StripElem *elem= (StripElem*)(ptr-data);
+ char name[FILE_MAX];
+
+ BLI_split_dirfile_basic(value, NULL, name);
+ BLI_strncpy(elem-name, name, sizeof(elem-name));
+}
+
#else
static void rna_def_strip_element(BlenderRNA *brna)
@@ -253,6 +282,7 @@
prop= RNA_def_property(srna, filename, PROP_STRING, PROP_FILEPATH);
RNA_def_property_string_sdna(prop, NULL, name);
RNA_def_property_ui_text(prop, Filename, );
+ RNA_def_property_string_funcs(prop, NULL, NULL,
rna_SequenceElement_filename_set);
}
static void rna_def_strip_crop(BlenderRNA *brna)
@@ -736,6 +766,7 @@
prop= RNA_def_property(srna, filename, PROP_STRING, PROP_FILEPATH);
RNA_def_property_string_sdna(prop, NULL, strip-stripdata-name);
RNA_def_property_ui_text(prop, Filename, );
+ RNA_def_property_string_funcs(prop, NULL, NULL,
rna_MovieSequence_filename_set);
prop= RNA_def_property(srna, directory, PROP_STRING, PROP_DIRPATH);
RNA_def_property_string_sdna(prop, NULL, strip-dir);
@@ -762,6 +793,7 @@
prop= RNA_def_property(srna, filename, PROP_STRING, PROP_FILEPATH);
RNA_def_property_string_sdna(prop, NULL, strip-stripdata-name);
RNA_def_property_ui_text(prop, Filename, );
+ RNA_def_property_string_funcs(prop, NULL, NULL,
rna_SoundSequence_filename_set);
prop= RNA_def_property(srna, directory, PROP_STRING, PROP_DIRPATH);
RNA_def_property_string_sdna(prop, NULL, strip-dir);
___
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 [23396] trunk/blender/source/blender/ render/intern/source/pipeline.c: Fix #19425: crash with long filename and rendering full sample.
Revision: 23396
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23396
Author: blendix
Date: 2009-09-21 16:30:59 +0200 (Mon, 21 Sep 2009)
Log Message:
---
Fix #19425: crash with long filename and rendering full sample.
Modified Paths:
--
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===
--- trunk/blender/source/blender/render/intern/source/pipeline.c
2009-09-21 13:43:11 UTC (rev 23395)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c
2009-09-21 14:30:59 UTC (rev 23396)
@@ -406,7 +406,7 @@
static void render_unique_exr_name(Render *re, char *str, int sample)
{
- char di[FILE_MAX], name[FILE_MAXFILE], fi[FILE_MAXFILE];
+ char di[FILE_MAX], name[FILE_MAXFILE+MAX_ID_NAME+100], fi[FILE_MAXFILE];
BLI_strncpy(di, G.sce, FILE_MAX);
BLI_splitdirstring(di, fi);
___
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 [23399] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: Second attempt at fixing #19335: holding down backspace in the
Revision: 23399 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23399 Author: blendix Date: 2009-09-21 17:51:29 +0200 (Mon, 21 Sep 2009) Log Message: --- Second attempt at fixing #19335: holding down backspace in the text editor creates squares on some systems. Based on info from Martin, it appears the keymodifier is being set when it shouldn't. I think this is happening become some systems may be generating KM_PRESS events without a matching KM_RELEASE? Also ignore ascii values 1-32 now instead of 14-32, not sure why they were included now in 2.5 because they were not in 2.4, but I don't see a reason to do it. This fixes squares when pressing e.g. ctrl+b or ctrl+n. Modified Paths: -- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c === --- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2009-09-21 15:47:41 UTC (rev 23398) +++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2009-09-21 15:51:29 UTC (rev 23399) @@ -1600,7 +1600,7 @@ event.val= (type==GHOST_kEventKeyDown)?KM_PRESS:KM_RELEASE; /* exclude arrow keys, esc, etc from text input */ - if(type==GHOST_kEventKeyUp || (event.ascii32 event.ascii14)) + if(type==GHOST_kEventKeyUp || (event.ascii32 event.ascii0)) event.ascii= '\0'; /* modifiers */ @@ -1630,6 +1630,13 @@ else if(event.val==KM_RELEASE event.keymodifier==event.type) event.keymodifier= evt-keymodifier= 0; } + + /* this case happens on some systems that on holding a key pressed, + generate press events without release, we still want to keep the + modifier in win-eventstate, but for the press event of the same + key we don't want the key modifier */ + if(event.keymodifier == event.type) + event.keymodifier= 0; /* if test_break set, it catches this. XXX Keep global for now? */ if(event.type==ESCKEY) ___ 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 [23401] trunk/blender/source/blender/ editors/uvedit/uvedit_ops.c: Fix #19382: crash on uv edit stitch, tweaking limit property in tool area.
Revision: 23401
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23401
Author: blendix
Date: 2009-09-21 18:08:38 +0200 (Mon, 21 Sep 2009)
Log Message:
---
Fix #19382: crash on uv edit stitch, tweaking limit property in tool area.
Modified Paths:
--
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c2009-09-21
16:01:31 UTC (rev 23400)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c2009-09-21
16:08:38 UTC (rev 23401)
@@ -180,7 +180,13 @@
{
int width, height;
- ED_space_image_size(sima, width, height);
+ if(sima) {
+ ED_space_image_size(sima, width, height);
+ }
+ else {
+ width= 256;
+ height= 256;
+ }
dist[0]= pixeldist/width;
dist[1]= pixeldist/height;
@@ -1097,11 +1103,11 @@
if(RNA_boolean_get(op-ptr, use_limit)) {
UvVertMap *vmap;
UvMapVert *vlist, *iterv;
- float newuv[2], limit[2], pixels;
+ float newuv[2], limit[2];
int a, vtot;
- pixels= RNA_float_get(op-ptr, limit);
- uvedit_pixel_to_float(sima, limit, pixels);
+ limit[0]= RNA_float_get(op-ptr, limit);
+ limit[1]= limit[0];
EM_init_index_arrays(em, 0, 0, 1);
vmap= EM_make_uv_vert_map(em, 1, 0, limit);
@@ -1255,7 +1261,7 @@
/* properties */
RNA_def_boolean(ot-srna, use_limit, 1, Use Limit, Stitch UVs
within a specified limit distance.);
- RNA_def_float(ot-srna, limit, 20.0, 0.0f, FLT_MAX, Limit, Limit
distance in image pixels., -FLT_MAX, FLT_MAX);
+ RNA_def_float(ot-srna, limit, 0.01f, 0.0f, FLT_MAX, Limit, Limit
distance in normalized coordinates., -FLT_MAX, FLT_MAX);
}
/* (de)select all operator */
@@ -1439,7 +1445,7 @@
else {
sync= 0;
selectmode= ts-uv_selectmode;
- sticky= sima ? sima-sticky : 1;
+ sticky= (sima)? sima-sticky: 1;
}
/* find nearest element */
___
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 [23404] trunk/blender/source/blender/ makesrna/intern/rna_scene.c: Fix #19378: border render coordinates were not RNA wrapped.
Revision: 23404 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23404 Author: blendix Date: 2009-09-21 18:51:04 +0200 (Mon, 21 Sep 2009) Log Message: --- Fix #19378: border render coordinates were not RNA wrapped. Modified Paths: -- trunk/blender/source/blender/makesrna/intern/rna_scene.c Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c === --- trunk/blender/source/blender/makesrna/intern/rna_scene.c2009-09-21 16:39:07 UTC (rev 23403) +++ trunk/blender/source/blender/makesrna/intern/rna_scene.c2009-09-21 16:51:04 UTC (rev 23404) @@ -1665,6 +1665,30 @@ RNA_def_property_boolean_sdna(prop, NULL, mode, R_BORDER); RNA_def_property_ui_text(prop, Border, Render a user-defined border region, within the frame size.); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); + + prop= RNA_def_property(srna, border_min_x, PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, border.xmin); + RNA_def_property_range(prop, 0.0f, 1.0f); + RNA_def_property_ui_text(prop, Border Minimum X, Sets minimum X value to for the render border.); + RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); + + prop= RNA_def_property(srna, border_min_y, PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, border.ymin); + RNA_def_property_range(prop, 0.0f, 1.0f); + RNA_def_property_ui_text(prop, Border Minimum Y, Sets minimum Y value for the render border); + RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); + + prop= RNA_def_property(srna, border_max_x, PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, border.xmax); + RNA_def_property_range(prop, 0.0f, 1.0f); + RNA_def_property_ui_text(prop, Border Maximum X, Sets maximum X value for the render border); + RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); + + prop= RNA_def_property(srna, border_max_y, PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, border.ymax); + RNA_def_property_range(prop, 0.0f, 1.0f); + RNA_def_property_ui_text(prop, Border Maximum Y, Sets maximum Y value for the render border); + RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, crop_to_border, PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, mode, R_CROP); ___ 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 [23405] trunk/blender/source/blender/ editors/space_view3d/view3d_header.c: Fix #19384: missing redraw when changing transform orientation.
Revision: 23405 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23405 Author: blendix Date: 2009-09-21 19:00:22 +0200 (Mon, 21 Sep 2009) Log Message: --- Fix #19384: missing redraw when changing transform orientation. Modified Paths: -- trunk/blender/source/blender/editors/space_view3d/view3d_header.c Modified: trunk/blender/source/blender/editors/space_view3d/view3d_header.c === --- trunk/blender/source/blender/editors/space_view3d/view3d_header.c 2009-09-21 16:51:04 UTC (rev 23404) +++ trunk/blender/source/blender/editors/space_view3d/view3d_header.c 2009-09-21 17:00:22 UTC (rev 23405) @@ -1801,8 +1801,10 @@ ED_area_tag_redraw(sa); break; case B_NDOF: +ED_area_tag_redraw(sa); break; case B_MAN_MODE: +ED_area_tag_redraw(sa); break; case B_VIEW_BUTSEDIT: break; ___ 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 [23406] trunk/blender/source/blender/ editors/mesh/editmesh_mods.c: Fix #19426: loop select with occlude background geometry did not
Revision: 23406
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23406
Author: blendix
Date: 2009-09-21 19:32:25 +0200 (Mon, 21 Sep 2009)
Log Message:
---
Fix #19426: loop select with occlude background geometry did not
work after subdivide operator, needed a check for valid backbuf.
Modified Paths:
--
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
Modified: trunk/blender/source/blender/editors/mesh/editmesh_mods.c
===
--- trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2009-09-21
17:00:22 UTC (rev 23405)
+++ trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2009-09-21
17:32:25 UTC (rev 23406)
@@ -2033,6 +2033,9 @@
vc.mval[0]= mval[0];
vc.mval[1]= mval[1];
em= vc.em;
+
+ /* no afterqueue (yet), so we check it now, otherwise the em_xxxofs
indices are bad */
+ view3d_validate_backbuf(vc);
eed= findnearestedge(vc, dist);
if(eed) {
@@ -2110,6 +2113,9 @@
vc.mval[1]= mval[1];
em= vc.em;
+ /* no afterqueue (yet), so we check it now, otherwise the em_xxxofs
indices are bad */
+ view3d_validate_backbuf(vc);
+
eed= findnearestedge(vc, dist);
if(eed) {
Mesh *me= vc.obedit-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 [23409] trunk/blender/source/blender/ editors/interface/interface_templates.c: Fix part of #19307: modifier cage button not working as a toggle button
Revision: 23409
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23409
Author: blendix
Date: 2009-09-21 23:03:50 +0200 (Mon, 21 Sep 2009)
Log Message:
---
Fix part of #19307: modifier cage button not working as a toggle button.
Modified Paths:
--
trunk/blender/source/blender/editors/interface/interface_templates.c
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===
--- trunk/blender/source/blender/editors/interface/interface_templates.c
2009-09-21 20:50:11 UTC (rev 23408)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c
2009-09-21 21:03:50 UTC (rev 23409)
@@ -405,10 +405,12 @@
static void modifiers_setOnCage(bContext *C, void *ob_v, void *md_v)
{
Object *ob = ob_v;
- ModifierData *md;
-
+ ModifierData *md= md_v;
int i, cageIndex = modifiers_getCageIndex(ob, NULL );
+ /* undo button operation */
+ md-mode ^= eModifierMode_OnCage;
+
for(i = 0, md=ob-modifiers.first; md; ++i, md=md-next) {
if(md == md_v) {
if(i = cageIndex)
@@ -517,9 +519,10 @@
/* XXX uiBlockSetEmboss(block, UI_EMBOSSR); */
if(ob-type==OB_MESH modifier_couldBeCage(md)
index=lastCageIndex) {
-
/* XXX uiBlockSetCol(block, color); */
- but = uiDefIconBut(block, BUT, 0, ICON_MESH_DATA, 0, 0,
16, 20, NULL, 0.0, 0.0, 0.0, 0.0, Apply modifier to editing cage during
Editmode);
+ but = uiDefIconButBitI(block, TOG,
eModifierMode_OnCage, 0, ICON_MESH_DATA, 0, 0, 16, 20, md-mode, 0.0, 0.0,
0.0, 0.0, Apply modifier to editing cage during Editmode);
+ if(index cageIndex)
+ uiButSetFlag(but, UI_BUT_DISABLED);
uiButSetFunc(but, modifiers_setOnCage, ob, md);
uiBlockEndAlign(block);
/* XXX uiBlockSetCol(block, TH_AUTO); */
___
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 [23411] trunk/blender/source/blender: Fix #19427, problem in blenfont not computing the width of text correct,
Revision: 23411
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23411
Author: blendix
Date: 2009-09-21 23:26:04 +0200 (Mon, 21 Sep 2009)
Log Message:
---
Fix #19427, problem in blenfont not computing the width of text correct,
particularly text including spaces. This gave some problems with placing
the cursor and selection, and clipping text inside buttons.
Modified Paths:
--
trunk/blender/source/blender/blenfont/intern/blf_font.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
Modified: trunk/blender/source/blender/blenfont/intern/blf_font.c
===
--- trunk/blender/source/blender/blenfont/intern/blf_font.c 2009-09-21
21:19:58 UTC (rev 23410)
+++ trunk/blender/source/blender/blenfont/intern/blf_font.c 2009-09-21
21:26:04 UTC (rev 23411)
@@ -353,8 +353,8 @@
pen_x += delta.x 6;
}
- gbox.xmin= g-box.xmin + pen_x;
- gbox.xmax= g-box.xmax + pen_x;
+ gbox.xmin= pen_x;
+ gbox.xmax= pen_x + g-advance;
gbox.ymin= g-box.ymin + pen_y;
gbox.ymax= g-box.ymax + pen_y;
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===
--- trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-09-21 21:19:58 UTC (rev 23410)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-09-21 21:26:04 UTC (rev 23411)
@@ -773,7 +773,8 @@
/* sets but-ofs to make sure text is correctly visible */
static void ui_text_leftclip(uiFontStyle *fstyle, uiBut *but, rcti *rect)
{
- int okwidth= rect-xmax-rect-xmin;
+ int border= (but-flag UI_BUT_ALIGN_RIGHT)? 8: 10;
+ int okwidth= rect-xmax-rect-xmin - border;
/* need to set this first */
uiStyleFontSet(fstyle);
@@ -842,11 +843,8 @@
but-drawstr[selend_tmp]= ch;
- /* if at pos 0, leave a bit more to the left */
- t= (pos == 0)? 0: 1;
-
glColor3ubv((unsigned char*)wcol-item);
- glRects(rect-xmin+selsta_draw+1, rect-ymin+2,
rect-xmin+selwidth_draw+1, rect-ymax-2);
+ glRects(rect-xmin+selsta_draw, rect-ymin+2,
rect-xmin+selwidth_draw, rect-ymax-2);
}
} else {
/* text cursor */
@@ -861,9 +859,6 @@
but-drawstr[pos]= ch;
}
- /* if at pos 0, leave a bit more to the left */
- t += (pos == 0)? 0: 1;
-
glColor3ub(255,0,0);
glRects(rect-xmin+t, rect-ymin+2,
rect-xmin+t+2, rect-ymax-2);
}
___
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 [23413] trunk/blender/source/blender/ editors/space_view3d/view3d_view.c: Fix #19391: quiting BGE could give drawing errors.
Revision: 23413 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23413 Author: blendix Date: 2009-09-21 23:37:19 +0200 (Mon, 21 Sep 2009) Log Message: --- Fix #19391: quiting BGE could give drawing errors. Blender now restores the default OpenGL state after exiting the game engine, and also removed settings the default state on start, since the game engine already does this. Modified Paths: -- trunk/blender/source/blender/editors/space_view3d/view3d_view.c Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c === --- trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2009-09-21 21:28:48 UTC (rev 23412) +++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2009-09-21 21:37:19 UTC (rev 23413) @@ -1416,8 +1416,6 @@ glPushAttrib(GL_ALL_ATTRIB_BITS); - GPU_state_init(); - if(obact obact-mode OB_MODE_TEXTURE_PAINT) GPU_paint_set_mipmap(1); @@ -1446,6 +1444,8 @@ win-queue= queue_back; + GPU_state_init(); + glPopAttrib(); } ___ 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 [23448] trunk/blender/source/blender/ editors/interface/interface.c: Fix #19446: merge operator needs to be undone twice, interface
Revision: 23448 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23448 Author: blendix Date: 2009-09-24 12:46:52 +0200 (Thu, 24 Sep 2009) Log Message: --- Fix #19446: merge operator needs to be undone twice, interface was still doing undo pushes in cases it was not needed. Modified Paths: -- trunk/blender/source/blender/editors/interface/interface.c Modified: trunk/blender/source/blender/editors/interface/interface.c === --- trunk/blender/source/blender/editors/interface/interface.c 2009-09-24 10:41:28 UTC (rev 23447) +++ trunk/blender/source/blender/editors/interface/interface.c 2009-09-24 10:46:52 UTC (rev 23448) @@ -2271,8 +2271,9 @@ } } - if(!ELEM7(but-type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, LISTBOX, SEARCH_MENU)) - but-flag |= UI_BUT_UNDO; + if(ELEM8(but-type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, LISTBOX, SEARCH_MENU, BUTM)); + else if(ELEM5(but-type, SCROLL, SEPR, LINK, INLINK, FTPREVIEW)); + else but-flag |= UI_BUT_UNDO; BLI_addtail(block-buttons, 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 [23451] trunk/blender/source/blender/ blenloader/intern/readfile.c: Fix for panorama backwards compatibility not working correct.
Revision: 23451
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23451
Author: blendix
Date: 2009-09-24 14:15:17 +0200 (Thu, 24 Sep 2009)
Log Message:
---
Fix for panorama backwards compatibility not working correct.
Modified Paths:
--
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2009-09-24
11:46:17 UTC (rev 23450)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-09-24
12:15:17 UTC (rev 23451)
@@ -9366,7 +9366,7 @@
strcpy(sce-nodetree-id.name, NTComposit
Nodetree);
/* move to cameras */
- if(sce-r.scemode R_PANORAMA) {
+ if(sce-r.mode R_PANORAMA) {
for(base=sce-base.first; base;
base=base-next) {
ob= newlibadr(fd, lib, base-object);
@@ -9376,7 +9376,7 @@
}
}
- sce-r.scemode = ~R_PANORAMA;
+ sce-r.mode = ~R_PANORAMA;
}
}
/* and texture trees */
___
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 [23480] trunk/blender: Warning fixes for ITASC.
Revision: 23480
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23480
Author: blendix
Date: 2009-09-25 11:33:46 +0200 (Fri, 25 Sep 2009)
Log Message:
---
Warning fixes for ITASC. Also, use stdlib.h instead of malloc.h,
it works everywhere.
Modified Paths:
--
trunk/blender/intern/itasc/Armature.cpp
trunk/blender/intern/itasc/Cache.cpp
trunk/blender/intern/itasc/ConstraintSet.cpp
trunk/blender/intern/itasc/CopyPose.cpp
trunk/blender/intern/itasc/WSDLSSolver.hpp
trunk/blender/intern/itasc/kdl/jacobian.cpp
trunk/blender/intern/itasc/kdl/treefksolverpos_recursive.cpp
trunk/blender/source/blender/ikplugin/intern/ikplugin_api.c
trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
Modified: trunk/blender/intern/itasc/Armature.cpp
===
--- trunk/blender/intern/itasc/Armature.cpp 2009-09-25 07:44:29 UTC (rev
23479)
+++ trunk/blender/intern/itasc/Armature.cpp 2009-09-25 09:33:46 UTC (rev
23480)
@@ -8,9 +8,7 @@
#include Armature.hpp
#include algorithm
#include string.h
-#ifndef __STDC__
-#include malloc.h
-#endif
+#include stdlib.h
namespace iTaSC {
@@ -37,9 +35,9 @@
m_newqKdl(),
m_qdotKdl(),
m_jac(NULL),
+ m_armlength(0.0),
m_jacsolver(NULL),
- m_fksolver(NULL),
- m_armlength(0.0)
+ m_fksolver(NULL)
{
}
@@ -119,6 +117,8 @@
values[1].id = value[1].id = ID_JOINT_RZ;
v_nr = 2;
break;
+ case Joint::None:
+ break;
}
}
@@ -734,6 +734,8 @@
case ACT_ALPHA:
pConstraint-values[i].alpha = value;
break;
+ default:
+ break;
}
}
} else {
@@ -755,6 +757,8 @@
case ACT_ALPHA:
pConstraint-values[i].alpha =
value;
break;
+ case ACT_NONE:
+ break;
}
}
}
Modified: trunk/blender/intern/itasc/Cache.cpp
===
--- trunk/blender/intern/itasc/Cache.cpp2009-09-25 07:44:29 UTC (rev
23479)
+++ trunk/blender/intern/itasc/Cache.cpp2009-09-25 09:33:46 UTC (rev
23480)
@@ -7,9 +7,7 @@
#include string.h
#include assert.h
#include math.h
-#ifndef __STDC__
-#include malloc.h
-#endif
+#include stdlib.h
#include Cache.hpp
namespace iTaSC {
Modified: trunk/blender/intern/itasc/ConstraintSet.cpp
===
--- trunk/blender/intern/itasc/ConstraintSet.cpp2009-09-25 07:44:29 UTC
(rev 23479)
+++ trunk/blender/intern/itasc/ConstraintSet.cpp2009-09-25 09:33:46 UTC
(rev 23480)
@@ -12,13 +12,13 @@
ConstraintSet::ConstraintSet(unsigned int _nc,double accuracy,unsigned int
maximum_iterations):
m_nc(_nc),
+m_Cf(e_zero_matrix(m_nc,6)),
+m_Wy(e_scalar_vector(m_nc,1.0)),
+m_y(m_nc),m_ydot(e_zero_vector(m_nc)),m_chi(e_zero_vector(6)),
+m_S(6),m_temp(6),m_tdelta(6),
m_Jf(e_identity_matrix(6,6)),
-m_Cf(e_zero_matrix(m_nc,6)),
m_U(e_identity_matrix(6,6)),m_V(e_identity_matrix(6,6)),m_B(e_zero_matrix(6,6)),
m_Jf_inv(e_zero_matrix(6,6)),
-m_Wy(e_scalar_vector(m_nc,1.0)),
-m_chi(e_zero_vector(6)),m_y(m_nc),m_ydot(e_zero_vector(m_nc)),
-m_S(6),m_temp(6),m_tdelta(6),
m_internalPose(F_identity), m_externalPose(F_identity),
m_constraintCallback(NULL), m_constraintParam(NULL),
m_toggle(false),m_substep(false),
Modified: trunk/blender/intern/itasc/CopyPose.cpp
===
--- trunk/blender/intern/itasc/CopyPose.cpp 2009-09-25 07:44:29 UTC (rev
23479)
+++ trunk/blender/intern/itasc/CopyPose.cpp 2009-09-25 09:33:46 UTC (rev
23480)
@@ -21,7 +21,7 @@
{
m_maxerror = armlength/2.0;
m_outputControl = (control_output CTL_ALL);
- int _nc = nBitsOn(m_outputControl);
+ unsigned int _nc = nBitsOn(m_outputControl);
if (!_nc)
return;
// reset the constraint set
@@ -284,7 +284,7 @@
void CopyPose::updateState(ConstraintValues* _values, ControlState* _state,
unsigned int mask, double timestep)
{
- int id = (mask == CTL_ROTATIONX) ? ID_ROTATIONX : ID_POSITIONX;
+ unsigned int id = (mask == CTL_ROTATIONX) ? ID_ROTATIONX : ID_POSITIONX;
ControlState::ControlValue* _yval;
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23520] trunk/blender/source/blender/ editors: Fix #19482: setting cursor position in uv editor was not correct
Revision: 23520 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23520 Author: blendix Date: 2009-09-28 10:52:02 +0200 (Mon, 28 Sep 2009) Log Message: --- Fix #19482: setting cursor position in uv editor was not correct zoomed in, needed to make view2d offset for pixel rounding dependent on zoom level. Modified Paths: -- trunk/blender/source/blender/editors/interface/view2d.c trunk/blender/source/blender/editors/space_image/space_image.c Modified: trunk/blender/source/blender/editors/interface/view2d.c === --- trunk/blender/source/blender/editors/interface/view2d.c 2009-09-28 06:03:55 UTC (rev 23519) +++ trunk/blender/source/blender/editors/interface/view2d.c 2009-09-28 08:52:02 UTC (rev 23520) @@ -973,8 +973,8 @@ /* XXX brecht: instead of zero at least use a tiny offset, otherwise * pixel rounding is effectively random due to float inaccuracy */ - xofs= 0.001f; - yofs= 0.001f; + xofs= 0.001f*(v2d-cur.xmax - v2d-cur.xmin)/(v2d-mask.xmax - v2d-mask.xmin); + yofs= 0.001f*(v2d-cur.ymax - v2d-cur.ymin)/(v2d-mask.ymax - v2d-mask.ymin); /* apply mask-based adjustments to cur rect (due to scrollers), to eliminate scaling artifacts */ view2d_map_cur_using_mask(v2d, curmasked); Modified: trunk/blender/source/blender/editors/space_image/space_image.c === --- trunk/blender/source/blender/editors/space_image/space_image.c 2009-09-28 06:03:55 UTC (rev 23519) +++ trunk/blender/source/blender/editors/space_image/space_image.c 2009-09-28 08:52:02 UTC (rev 23520) @@ -374,8 +374,8 @@ ar-v2d.mask.ymax= winy; /* which part of the image space do we see? */ - x1= ar-winrct.xmin+(winx-sima-zoom*w)/2; - y1= ar-winrct.ymin+(winy-sima-zoom*h)/2; + x1= ar-winrct.xmin+(winx-sima-zoom*w)/2.0f; + y1= ar-winrct.ymin+(winy-sima-zoom*h)/2.0f; x1-= sima-zoom*sima-xof; y1-= sima-zoom*sima-yof; @@ -440,11 +440,13 @@ /* and uvs in 0.0-1.0 space */ UI_view2d_view_ortho(C, v2d); - draw_uvedit_main(sima, ar, scene, obedit); - ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST); + draw_uvedit_main(sima, ar, scene, obedit); + + ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST); - /* Grease Pencil too (in addition to UV's) */ - draw_image_grease_pencil((bContext *)C, 1); + /* Grease Pencil too (in addition to UV's) */ + draw_image_grease_pencil((bContext *)C, 1); + UI_view2d_view_restore(C); /* draw Grease Pencil - screen space only */ ___ 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 [23521] trunk/blender/source/blender/imbuf /intern/divers.c: Fix #19470: displaying depth pass could crash, conversion from
Revision: 23521
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23521
Author: blendix
Date: 2009-09-28 11:06:28 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix #19470: displaying depth pass could crash, conversion from
float to byte was not working correct.
Modified Paths:
--
trunk/blender/source/blender/imbuf/intern/divers.c
Modified: trunk/blender/source/blender/imbuf/intern/divers.c
===
--- trunk/blender/source/blender/imbuf/intern/divers.c 2009-09-28 08:52:02 UTC
(rev 23520)
+++ trunk/blender/source/blender/imbuf/intern/divers.c 2009-09-28 09:06:28 UTC
(rev 23521)
@@ -190,7 +190,11 @@
to = (unsigned char *) ibuf-rect;
}
- if (profile == IB_PROFILE_SRGB (channels == 3 || channels == 4)) {
+ if(channels==1) {
+ for (i = ibuf-x * ibuf-y; i 0; i--, to+=4, tof++)
+ to[1]= to[2]= to[3]= to[0] = FTOCHAR(tof[0]);
+ }
+ else if (profile == IB_PROFILE_SRGB) {
if(channels == 3) {
for (i = ibuf-x * ibuf-y; i 0; i--, to+=4, tof+=3) {
srgb[0]= linearrgb_to_srgb(tof[0]);
@@ -207,12 +211,8 @@
floatbuf_to_srgb_byte(tof, to, 0, ibuf-x, 0, ibuf-y,
ibuf-x);
}
}
- else if(ELEM(profile, IB_PROFILE_NONE, IB_PROFILE_LINEAR_RGB)
(dither==0.0f || channels!=4)) {
- if(channels==1) {
- for (i = ibuf-x * ibuf-y; i 0; i--, to+=4, tof++)
- to[1]= to[2]= to[3]= to[0] = FTOCHAR(tof[0]);
- }
- else if(channels==3) {
+ else if(ELEM(profile, IB_PROFILE_NONE, IB_PROFILE_LINEAR_RGB)
dither==0.0f) {
+ if(channels==3) {
for (i = ibuf-x * ibuf-y; i 0; i--, to+=4, tof+=3) {
to[0] = FTOCHAR(tof[0]);
to[1] = FTOCHAR(tof[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 [23527] trunk/blender/source/blender/ editors: File Browser fixes:
Revision: 23527
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23527
Author: blendix
Date: 2009-09-28 14:10:23 +0200 (Mon, 28 Sep 2009)
Log Message:
---
File Browser fixes:
* The code to draw only visible items was not working, giving slow
performance with many files (bug #19469).
* Fix detailed list display on non-windows, would give overlapping text.
* Fix folders with many files not displaying all items, changed short to
int in various places, was overflowing.
* Recreate layout on area resizes, file view gets out of sync otherwise.
* Workaround for v2d height not being correct with image display due to
scrollers.
* Fix view2d code to compute minimum scroller size, this would make the
scroller go outside of its bounds.
Modified Paths:
--
trunk/blender/source/blender/editors/include/ED_fileselect.h
trunk/blender/source/blender/editors/interface/view2d.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/editors/space_file/space_file.c
Modified: trunk/blender/source/blender/editors/include/ED_fileselect.h
===
--- trunk/blender/source/blender/editors/include/ED_fileselect.h
2009-09-28 12:10:13 UTC (rev 23526)
+++ trunk/blender/source/blender/editors/include/ED_fileselect.h
2009-09-28 12:10:23 UTC (rev 23527)
@@ -51,21 +51,21 @@
typedef struct FileLayout
{
/* view settings - XXX - move into own struct */
- short prv_w;
- short prv_h;
- short tile_w;
- short tile_h;
- short tile_border_x;
- short tile_border_y;
- short prv_border_x;
- short prv_border_y;
- short rows;
- short columns;
- short width;
- short height;
- short flag;
- short dirty;
- short textheight;
+ int prv_w;
+ int prv_h;
+ int tile_w;
+ int tile_h;
+ int tile_border_x;
+ int tile_border_y;
+ int prv_border_x;
+ int prv_border_y;
+ int rows;
+ int columns;
+ int width;
+ int height;
+ int flag;
+ int dirty;
+ int textheight;
float column_widths[MAX_FILE_COLUMN];
} FileLayout;
@@ -84,7 +84,7 @@
int ED_fileselect_layout_numfiles(FileLayout* layout, struct ARegion *ar);
int ED_fileselect_layout_offset(FileLayout* layout, int x, int y);
-void ED_fileselect_layout_tilepos(FileLayout* layout, int tile, short *x,
short *y);
+void ED_fileselect_layout_tilepos(FileLayout* layout, int tile, int *x, int
*y);
#endif /* ED_FILES_H */
Modified: trunk/blender/source/blender/editors/interface/view2d.c
===
--- trunk/blender/source/blender/editors/interface/view2d.c 2009-09-28
12:10:13 UTC (rev 23526)
+++ trunk/blender/source/blender/editors/interface/view2d.c 2009-09-28
12:10:23 UTC (rev 23527)
@@ -831,6 +831,7 @@
height= abs(height);
/* hrumf! */
+ /* XXX: there are work arounds for this in the panel and file browse
code. */
if(scroll V2D_SCROLL_HORIZONTAL)
width -= V2D_SCROLL_WIDTH;
if(scroll V2D_SCROLL_VERTICAL)
@@ -1397,8 +1398,14 @@
if (scrollers-hor_min scrollers-hor_max)
scrollers-hor_min= scrollers-hor_max;
/* prevent sliders from being too small, and disappearing */
- if ((scrollers-hor_max - scrollers-hor_min)
V2D_SCROLLER_HANDLE_SIZE)
- scrollers-hor_max+= V2D_SCROLLER_HANDLE_SIZE;
+ if ((scrollers-hor_max - scrollers-hor_min)
V2D_SCROLLER_HANDLE_SIZE) {
+ scrollers-hor_max= scrollers-hor_min +
V2D_SCROLLER_HANDLE_SIZE;
+
+ if(scrollers-hor_max hor.xmax) {
+ scrollers-hor_max= hor.xmax;
+ scrollers-hor_min= MAX2(scrollers-hor_max -
V2D_SCROLLER_HANDLE_SIZE, hor.xmin);
+ }
+ }
/* check whether sliders can disappear */
if(v2d-keeptot) {
@@ -1429,8 +1436,14 @@
if (scrollers-vert_min scrollers-vert_max)
scrollers-vert_min= scrollers-vert_max;
/* prevent sliders from being too small, and disappearing */
- if ((scrollers-vert_max - scrollers-vert_min)
V2D_SCROLLER_HANDLE_SIZE)
- scrollers-vert_max+= V2D_SCROLLER_HANDLE_SIZE;
+ if ((scrollers-vert_max - scrollers-vert_min)
V2D_SCROLLER_HANDLE_SIZE) {
+ scrollers-vert_max= scrollers-vert_min +
V2D_SCROLLER_HANDLE_SIZE;
+
+ if(scrollers-vert_max vert.ymax) {
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23531] trunk/blender/source/blender: RNA
Revision: 23531 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23531 Author: blendix Date: 2009-09-28 16:28:45 +0200 (Mon, 28 Sep 2009) Log Message: --- RNA * Move mesh API functions to mesh_data.c, would like to keep RNA layer fairly thin, any non-trivial functions shoud be in their modules. * Replace mesh.create_copy by generic id.copy. * Fix #19250: Mesh.add_geometry() in editmode fails silently, now gives an error. Modified Paths: -- trunk/blender/source/blender/editors/include/ED_mesh.h trunk/blender/source/blender/makesrna/intern/rna_ID.c trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c Added Paths: --- trunk/blender/source/blender/editors/mesh/mesh_data.c Removed Paths: - trunk/blender/source/blender/editors/mesh/mesh_layers.c Modified: trunk/blender/source/blender/editors/include/ED_mesh.h === --- trunk/blender/source/blender/editors/include/ED_mesh.h 2009-09-28 13:05:03 UTC (rev 23530) +++ trunk/blender/source/blender/editors/include/ED_mesh.h 2009-09-28 14:28:45 UTC (rev 23531) @@ -38,6 +38,7 @@ struct bContext; struct wmOperator; struct wmWindowManager; +struct ReportList; struct EditSelection; struct ViewContext; struct bDeformGroup; @@ -49,6 +50,8 @@ struct UvVertMap; struct UvMapVert; struct CustomData; +struct Material; +struct Object; #define EM_FGON_DRAW 1 // face flag #define EM_FGON2 // edge and face flag both @@ -89,9 +92,9 @@ void ED_spacetypes_init(void); void ED_keymap_mesh(struct wmWindowManager *wm); -void make_editMesh(struct Scene *scene, Object *ob); -void load_editMesh(struct Scene *scene, Object *ob); -void remake_editMesh(struct Scene *scene, Object *ob); +void make_editMesh(struct Scene *scene, struct Object *ob); +void load_editMesh(struct Scene *scene, struct Object *ob); +void remake_editMesh(struct Scene *scene, struct Object *ob); void free_editMesh(struct EditMesh *em); void recalc_editnormals(struct EditMesh *em); @@ -184,5 +187,18 @@ int editface_containsEdge(struct EditFace *efa, struct EditEdge *eed); short sharesFace(struct EditMesh *em, struct EditEdge *e1, struct EditEdge *e2); +/* mesh_data.c */ + +void ED_mesh_geometry_add(struct Mesh *mesh, struct ReportList *reports, int verts, int edges, int faces); +void ED_mesh_transform(struct Mesh *me, float *mat); +void ED_mesh_calc_normals(struct Mesh *me); +void ED_mesh_material_add(struct Mesh *me, struct Material *ma); +void ED_mesh_update(struct Mesh *mesh, struct bContext *C); + +int ED_mesh_uv_texture_add(struct bContext *C, struct Scene *scene, struct Object *ob, struct Mesh *me); +int ED_mesh_uv_texture_remove(struct bContext *C, struct Object *ob, struct Mesh *me); +int ED_mesh_color_add(struct bContext *C, struct Scene *scene, struct Object *ob, struct Mesh *me); +int ED_mesh_color_remove(struct bContext *C, struct Object *ob, struct Mesh *me); + #endif /* ED_MESH_H */ Copied: trunk/blender/source/blender/editors/mesh/mesh_data.c (from rev 23529, trunk/blender/source/blender/editors/mesh/mesh_layers.c) === --- trunk/blender/source/blender/editors/mesh/mesh_data.c (rev 0) +++ trunk/blender/source/blender/editors/mesh/mesh_data.c 2009-09-28 14:28:45 UTC (rev 23531) @@ -0,0 +1,667 @@ +/** + * $Id$ + * + * * BEGIN GPL LICENSE BLOCK * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The Original Code is Copyright (C) 2009 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * * END GPL LICENSE BLOCK * + */ + +#include math.h +#include stdlib.h +#include string.h + +#include MEM_guardedalloc.h + +#include DNA_customdata_types.h +#include DNA_material_types.h +#include DNA_mesh_types.h +#include DNA_meshdata_types.h +#include DNA_object_types.h +#include DNA_scene_types.h +#include DNA_windowmanager_types.h + +#include BKE_context.h +#include BKE_customdata.h +#include BKE_depsgraph.h +#include
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23532] trunk/blender/source/blender/ editors/space_outliner/outliner.c: Fix #19351: items in outliner disappear prematurely.
Revision: 23532
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23532
Author: blendix
Date: 2009-09-28 16:33:38 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix #19351: items in outliner disappear prematurely. Note icons
still disappear too soon, but this is an issue in the icon system,
same happens on all buttons, will have a fix for this later.
Modified Paths:
--
trunk/blender/source/blender/editors/space_outliner/outliner.c
Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===
--- trunk/blender/source/blender/editors/space_outliner/outliner.c
2009-09-28 14:28:45 UTC (rev 23531)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c
2009-09-28 14:33:38 UTC (rev 23532)
@@ -4324,7 +4324,7 @@
tselem= TREESTORE(te);
- if(*starty = ar-v2d.cur.ymin *starty= ar-v2d.cur.ymax) {
+ if(*starty+2*OL_H = ar-v2d.cur.ymin *starty= ar-v2d.cur.ymax) {
glEnable(GL_BLEND);
@@ -4579,7 +4579,7 @@
ystart= (int)ar-v2d.tot.ymax;
ystart= OL_H*(ystart/(OL_H));
- while(ystart ar-v2d.cur.ymin) {
+ while(ystart+2*OL_H ar-v2d.cur.ymin) {
glRecti(0, ystart, (int)ar-v2d.cur.xmax, ystart+OL_H);
ystart-= 2*OL_H;
}
@@ -4597,7 +4597,7 @@
ystart= (int)ar-v2d.tot.ymax;
ystart= OL_H*(ystart/(OL_H));
- while(ystart ar-v2d.cur.ymin) {
+ while(ystart+2*OL_H ar-v2d.cur.ymin) {
glRecti((int)ar-v2d.cur.xmax-OL_TOGW, ystart,
(int)ar-v2d.cur.xmax, ystart+OL_H);
ystart-= 2*OL_H;
}
@@ -4812,7 +4812,7 @@
for(te= lb-first; te; te= te-next) {
tselem= TREESTORE(te);
- if(te-ys = ar-v2d.cur.ymin te-ys = ar-v2d.cur.ymax) {
+ if(te-ys+2*OL_H = ar-v2d.cur.ymin te-ys =
ar-v2d.cur.ymax) {
/* objects have toggle-able restriction flags */
if(tselem-type==0 te-idcode==ID_OB) {
ob = (Object *)tselem-id;
@@ -4924,7 +4924,7 @@
for(te= lb-first; te; te= te-next) {
tselem= TREESTORE(te);
- if(te-ys = ar-v2d.cur.ymin te-ys = ar-v2d.cur.ymax) {
+ if(te-ys+2*OL_H = ar-v2d.cur.ymin te-ys =
ar-v2d.cur.ymax) {
if(tselem-type == TSE_RNA_PROPERTY) {
ptr= te-rnaptr;
prop= te-directdata;
@@ -5139,7 +5139,7 @@
for(te= lb-first; te; te= te-next) {
tselem= TREESTORE(te);
- if(te-ys = ar-v2d.cur.ymin te-ys = ar-v2d.cur.ymax) {
+ if(te-ys+2*OL_H = ar-v2d.cur.ymin te-ys =
ar-v2d.cur.ymax) {
uiBut *but;
char *str;
int xstart= 240;
@@ -5217,7 +5217,7 @@
for(te= lb-first; te; te= te-next) {
tselem= TREESTORE(te);
- if(te-ys = ar-v2d.cur.ymin te-ys = ar-v2d.cur.ymax) {
+ if(te-ys+2*OL_H = ar-v2d.cur.ymin te-ys =
ar-v2d.cur.ymax) {
if(tselem-flag TSE_TEXTBUT) {
___
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 [23533] trunk/blender/source/blender/ editors/object/object_edit.c: Fix #19453: rendering with mesh in edit mode would put the object
Revision: 23533
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23533
Author: blendix
Date: 2009-09-28 16:40:37 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix #19453: rendering with mesh in edit mode would put the object
partially back in object mode, disabling e.g. X delete.
Modified Paths:
--
trunk/blender/source/blender/editors/object/object_edit.c
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===
--- trunk/blender/source/blender/editors/object/object_edit.c 2009-09-28
14:33:38 UTC (rev 23532)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2009-09-28
14:40:37 UTC (rev 23533)
@@ -332,7 +332,7 @@
if(freedata) free_editMball(obedit);
}
- /* freedata only 0 now on file saves */
+ /* freedata only 0 now on file saves and render */
if(freedata) {
ListBase pidlist;
PTCacheID *pid;
@@ -357,10 +357,10 @@
if(flag EM_WAITCURSOR) waitcursor(0);
WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT,
scene);
+
+ obedit-mode = ~OB_MODE_EDIT;
+ ED_object_toggle_modes(C, obedit-restore_mode);
}
-
- obedit-mode = ~OB_MODE_EDIT;
- ED_object_toggle_modes(C, obedit-restore_mode);
}
___
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 [23534] trunk/blender/source/blender/ editors/transform: Fix #19468: particle mode crash in transform, when there are
Revision: 23534
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23534
Author: blendix
Date: 2009-09-28 16:51:42 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix #19468: particle mode crash in transform, when there are
no editable particles.
Modified Paths:
--
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===
--- trunk/blender/source/blender/editors/transform/transform_conversions.c
2009-09-28 14:40:37 UTC (rev 23533)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c
2009-09-28 14:51:42 UTC (rev 23534)
@@ -4825,7 +4825,7 @@
// allqueue(REDRAWBUTSEDIT, 0);
}
- else if(t-scene-basact (ob = t-scene-basact-object) ob-mode
OB_MODE_PARTICLE_EDIT) {
+ else if(t-scene-basact (ob = t-scene-basact-object)
(ob-mode OB_MODE_PARTICLE_EDIT) PE_get_current(t-scene, ob)) {
;
}
else {
Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===
--- trunk/blender/source/blender/editors/transform/transform_generics.c
2009-09-28 14:40:37 UTC (rev 23533)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c
2009-09-28 14:51:42 UTC (rev 23534)
@@ -92,6 +92,7 @@
#include ED_markers.h
#include ED_mesh.h
#include ED_retopo.h
+#include ED_particle.h
#include ED_screen_types.h
#include ED_space_api.h
#include ED_uvedit.h
@@ -346,7 +347,7 @@
if (t-obedit) {
}
- else if(base base-object-mode OB_MODE_PARTICLE_EDIT) {
+ else if(base (base-object-mode OB_MODE_PARTICLE_EDIT)
PE_get_current(scene, base-object)) {
flushTransParticles(t);
}
if (t-spacetype==SPACE_NODE) {
___
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 [23535] trunk/blender/source/blender/ editors/transform/transform_manipulator.c: Fix #19477: transform manipulator did not work correct with
Revision: 23535
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23535
Author: blendix
Date: 2009-09-28 17:14:52 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix #19477: transform manipulator did not work correct with
quad view, got wrong context.
Modified Paths:
--
trunk/blender/source/blender/editors/transform/transform_manipulator.c
Modified: trunk/blender/source/blender/editors/transform/transform_manipulator.c
===
--- trunk/blender/source/blender/editors/transform/transform_manipulator.c
2009-09-28 14:51:42 UTC (rev 23534)
+++ trunk/blender/source/blender/editors/transform/transform_manipulator.c
2009-09-28 15:14:52 UTC (rev 23535)
@@ -1602,7 +1602,7 @@
break;
}
RNA_boolean_set_array(op-ptr, constraint_axis,
constraint_axis);
- WM_operator_name_call(C, TFM_OT_translate,
WM_OP_INVOKE_REGION_WIN, op-ptr);
+ WM_operator_name_call(C, TFM_OT_translate,
WM_OP_INVOKE_DEFAULT, op-ptr);
}
else if (drawflags MAN_SCALE_C) {
switch(drawflags) {
@@ -1632,10 +1632,10 @@
break;
}
RNA_boolean_set_array(op-ptr, constraint_axis,
constraint_axis);
- WM_operator_name_call(C, TFM_OT_resize,
WM_OP_INVOKE_REGION_WIN, op-ptr);
+ WM_operator_name_call(C, TFM_OT_resize,
WM_OP_INVOKE_DEFAULT, op-ptr);
}
else if (drawflags == MAN_ROT_T) { /* trackball need special
case, init is different */
- WM_operator_name_call(C, TFM_OT_trackball,
WM_OP_INVOKE_REGION_WIN, op-ptr);
+ WM_operator_name_call(C, TFM_OT_trackball,
WM_OP_INVOKE_DEFAULT, op-ptr);
}
else if (drawflags MAN_ROT_C) {
switch(drawflags) {
@@ -1650,7 +1650,7 @@
break;
}
RNA_boolean_set_array(op-ptr, constraint_axis,
constraint_axis);
- WM_operator_name_call(C, TFM_OT_rotate,
WM_OP_INVOKE_REGION_WIN, op-ptr);
+ WM_operator_name_call(C, TFM_OT_rotate,
WM_OP_INVOKE_DEFAULT, op-ptr);
}
}
/* after transform, restore drawflags */
___
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 [23536] trunk/blender/source/blender/ windowmanager/intern/wm_files.c: Fix #19479: ctrl+N could temporarily freeze the window when user
Revision: 23536
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23536
Author: blendix
Date: 2009-09-28 17:34:15 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix #19479: ctrl+N could temporarily freeze the window when user
preferences were saved from a separate window. Missing transfor of
active window state to the new window.
Modified Paths:
--
trunk/blender/source/blender/windowmanager/intern/wm_files.c
Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c
2009-09-28 15:14:52 UTC (rev 23535)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c
2009-09-28 15:34:15 UTC (rev 23536)
@@ -195,6 +195,7 @@
/* ensure making new keymaps and set space types */
wm-initialized= 0;
+ wm-winactive= NULL;
/* only first wm in list has ghostwins */
for(win= wm-windows.first; win; win= win-next) {
@@ -202,6 +203,10 @@
if(oldwin-winid == win-winid ) {
win-ghostwin= oldwin-ghostwin;
+ win-active= oldwin-active;
+ if(win-active)
+ wm-winactive= win;
+
GHOST_SetWindowUserData(win-ghostwin, win);/* pointer back */
oldwin-ghostwin= NULL;
___
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 [23537] trunk/blender/source/blender/ blenlib/intern/util.c: File paths: use release/ for scripts if possible again, this got
Revision: 23537 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23537 Author: blendix Date: 2009-09-28 17:47:05 +0200 (Mon, 28 Sep 2009) Log Message: --- File paths: use release/ for scripts if possible again, this got changed with the file path changes, the reason to check this first is that it allows to edit py scripts without having to run the build system for each change. Modified Paths: -- trunk/blender/source/blender/blenlib/intern/util.c Modified: trunk/blender/source/blender/blenlib/intern/util.c === --- trunk/blender/source/blender/blenlib/intern/util.c 2009-09-28 15:34:15 UTC (rev 23536) +++ trunk/blender/source/blender/blenlib/intern/util.c 2009-09-28 15:47:05 UTC (rev 23537) @@ -902,16 +902,16 @@ s = BLI_last_slash(bprogname); i = s - bprogname + 1; BLI_strncpy(bprogdir, bprogname, i); - - /* try ./.blender/folder_name */ - if(test_data_path(targetpath, bprogdir, .blender, folder_name)) + + /* try release/folder_name (CWD relative) */ + if(test_data_path(targetpath, BLI_getwdN(cwd), release, folder_name)) return 1; - + if(test_data_path(targetpath, bprogdir, release, folder_name)) return 1; - - /* try release/folder_name (CWD relative) */ - if(test_data_path(targetpath, BLI_getwdN(cwd), release, folder_name)) + + /* try ./.blender/folder_name */ + if(test_data_path(targetpath, bprogdir, .blender, folder_name)) return 1; return 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 [23539] trunk/blender/source/blender/ editors: Fix drawing of MENU buttons with only an icon, was not aligned right
Revision: 23539
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23539
Author: blendix
Date: 2009-09-28 17:59:09 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix drawing of MENU buttons with only an icon, was not aligned right
and showing unneeded triangles (+ buttons in Boids Brain).
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_intern.h
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===
--- trunk/blender/source/blender/editors/include/UI_interface.h 2009-09-28
15:49:26 UTC (rev 23538)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2009-09-28
15:59:09 UTC (rev 23539)
@@ -424,6 +424,7 @@
uiBut *uiDefPulldownBut(uiBlock *block, uiBlockCreateFunc func, void *arg,
char *str, short x1, short y1, short x2, short y2, char *tip);
uiBut *uiDefMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, char
*str, short x1, short y1, short x2, short y2, char *tip);
uiBut *uiDefIconTextMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg,
int icon, char *str, short x1, short y1, short x2, short y2, char *tip);
+uiBut *uiDefIconMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, int
icon, short x1, short y1, short x2, short y2, char *tip);
uiBut *uiDefBlockBut(uiBlock *block, uiBlockCreateFunc func, void *func_arg1,
char *str, short x1, short y1, short x2, short y2, char *tip);
uiBut *uiDefBlockButN(uiBlock *block, uiBlockCreateFunc func, void *argN, char
*str, short x1, short y1, short x2, short y2, char *tip);
Modified: trunk/blender/source/blender/editors/interface/interface.c
===
--- trunk/blender/source/blender/editors/interface/interface.c 2009-09-28
15:49:26 UTC (rev 23538)
+++ trunk/blender/source/blender/editors/interface/interface.c 2009-09-28
15:59:09 UTC (rev 23539)
@@ -3064,6 +3064,20 @@
return but;
}
+uiBut *uiDefIconMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, int
icon, short x1, short y1, short x2, short y2, char *tip)
+{
+ uiBut *but= ui_def_but(block, PULLDOWN, 0, , x1, y1, x2, y2, arg,
0.0, 0.0, 0.0, 0.0, tip);
+
+ but-icon= (BIFIconID) icon;
+ but-flag |= UI_HAS_ICON;
+ but-flag =~ UI_ICON_LEFT;
+
+ but-menu_create_func= func;
+ ui_check_but(but);
+
+ return but;
+}
+
/* Block button containing both string label and icon */
uiBut *uiDefIconTextBlockBut(uiBlock *block, uiBlockCreateFunc func, void
*arg, int icon, char *str, short x1, short y1, short x2, short y2, char *tip)
{
Modified: trunk/blender/source/blender/editors/interface/interface_intern.h
===
--- trunk/blender/source/blender/editors/interface/interface_intern.h
2009-09-28 15:49:26 UTC (rev 23538)
+++ trunk/blender/source/blender/editors/interface/interface_intern.h
2009-09-28 15:59:09 UTC (rev 23539)
@@ -72,6 +72,7 @@
/* menus */
UI_WTYPE_MENU_RADIO,
+ UI_WTYPE_MENU_ICON_RADIO,
UI_WTYPE_MENU_POINTER_LINK,
UI_WTYPE_PULLDOWN,
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===
--- trunk/blender/source/blender/editors/interface/interface_layout.c
2009-09-28 15:49:26 UTC (rev 23538)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c
2009-09-28 15:59:09 UTC (rev 23539)
@@ -1183,8 +1183,10 @@
if(layout-root-type == UI_LAYOUT_HEADER) /* ugly .. */
w -= 10;
- if(icon)
+ if(name[0] icon)
but= uiDefIconTextMenuBut(block, func, arg, icon, (char*)name,
0, 0, w, h, );
+ else if(icon)
+ but= uiDefIconMenuBut(block, func, arg, icon, 0, 0, w, h, );
else
but= uiDefMenuBut(block, func, arg, (char*)name, 0, 0, w, h,
);
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===
--- trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-09-28 15:49:26 UTC (rev 23538)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-09-28 15:59:09 UTC (rev 23539)
@@ -1973,7 +1973,19 @@
/* text space */
rect-xmax -= (rect-ymax-rect-ymin);
+}
+
+static void widget_menuiconbut(uiWidgetColors *wcol, rcti *rect, int state,
int roundboxalign)
+{
+ uiWidgetBase wtb;
+ widget_init(wtb);
+
+ /* half rounded */
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23540] trunk/blender/source/blender/ blenlib/intern/dynlib.c: Fix compile problem on OS X Snow Leopard.
Revision: 23540
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23540
Author: blendix
Date: 2009-09-28 18:05:34 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix compile problem on OS X Snow Leopard. The Mac code for dynamic
library loading was using some non-public OS X functions, which give
linking issues for me. Since OS X 10.3 standard unix dlopen() is
supported, so I just removed this code, we don't support earlier
versions anyway.
Modified Paths:
--
trunk/blender/source/blender/blenlib/intern/dynlib.c
Modified: trunk/blender/source/blender/blenlib/intern/dynlib.c
===
--- trunk/blender/source/blender/blenlib/intern/dynlib.c2009-09-28
15:59:09 UTC (rev 23539)
+++ trunk/blender/source/blender/blenlib/intern/dynlib.c2009-09-28
16:05:34 UTC (rev 23540)
@@ -23,8 +23,6 @@
* The Original Code is: all of this file, with exception of below:
*
* Contributor(s): Peter O'Gorman
- * The functions osxdlopen() and osxerror()
- * are Copyright (c) 2002 Peter O'Gorman ogor...@users.sourceforge.net
*
* * END GPL LICENSE BLOCK *
*/
@@ -102,202 +100,6 @@
free(lib);
}
-#else
-#ifdef __APPLE__ /* MacOS X */
-
-#include mach-o/dyld.h
-#include dlfcn.h
-#include stdarg.h
-
-#define ERR_STR_LEN 256
-
-struct PILdynlib {
- void *handle;
-};
-
-static char *osxerror(int setget, const char *str, ...)
-{
- static char errstr[ERR_STR_LEN];
- static int err_filled = 0;
- char *retval;
- NSLinkEditErrors ler;
- int lerno;
- const char *dylderrstr;
- const char *file;
- va_list arg;
- if (setget = 0)
- {
- va_start(arg, str);
- strncpy(errstr, dlsimple: , ERR_STR_LEN);
- vsnprintf(errstr + 10, ERR_STR_LEN - 10, str, arg);
- va_end(arg);
- /* We prefer to use the dyld error string if setget is 0 */
- if (setget == 0) {
- NSLinkEditError(ler, lerno, file, dylderrstr);
-// printf(dyld: %s\n,dylderrstr);
- if (dylderrstr strlen(dylderrstr))
- strncpy(errstr,dylderrstr,ERR_STR_LEN);
- }
- err_filled = 1;
- retval = NULL;
- }
- else
- {
- if (!err_filled)
- retval = NULL;
- else
- retval = errstr;
- err_filled = 0;
- }
- return retval;
-}
-
-static void *osxdlopen(const char *path, int mode)
-{
- void *module = 0;
- NSObjectFileImage ofi = 0;
- NSObjectFileImageReturnCode ofirc;
- static int (*make_private_module_public) (NSModule module) = 0;
- unsigned int flags = NSLINKMODULE_OPTION_RETURN_ON_ERROR |
NSLINKMODULE_OPTION_PRIVATE;
-
- /* If we got no path, the app wants the global namespace, use -1 as the
marker
- in this case */
- if (!path)
- return (void *)-1;
-
- /* Create the object file image, works for things linked with the
-bundle arg to ld */
- ofirc = NSCreateObjectFileImageFromFile(path, ofi);
- switch (ofirc)
- {
- case NSObjectFileImageSuccess:
- /* It was okay, so use NSLinkModule to link in the
image */
- if (!(mode RTLD_LAZY)) flags +=
NSLINKMODULE_OPTION_BINDNOW;
- module = NSLinkModule(ofi, path,flags);
- /* Don't forget to destroy the object file image,
unless you like leaks */
- NSDestroyObjectFileImage(ofi);
- /* If the mode was global, then change the module, this
avoids
- multiply defined symbol errors to first load private
then make
- global. Silly, isn't it. */
- if ((mode RTLD_GLOBAL))
- {
- if (!make_private_module_public)
- {
-
_dyld_func_lookup(__dyld_NSMakePrivateModulePublic,
- (unsigned long *)make_private_module_public);
- }
- make_private_module_public(module);
- }
- break;
- case NSObjectFileImageInappropriateFile:
- /* It may have been a dynamic library rather than a
bundle, try to load it */
- module = (void *)NSAddImage(path,
NSADDIMAGE_OPTION_RETURN_ON_ERROR);
- break;
- case NSObjectFileImageFailure:
- osxerror(0,Object file setup failure : \%s\, path);
- return 0;
- case NSObjectFileImageArch:
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23541] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: Fix potential crash for file operators that don't define
Revision: 23541
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23541
Author: blendix
Date: 2009-09-28 18:11:06 +0200 (Mon, 28 Sep 2009)
Log Message:
---
Fix potential crash for file operators that don't define
a path property, now it will just give a warning.
Modified Paths:
--
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-09-28 16:05:34 UTC (rev 23540)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-09-28 16:11:06 UTC (rev 23541)
@@ -943,7 +943,7 @@
/* XXX also extension code in
image-save doesnt work for this yet */
if(strncmp(handler-op-type-name,
Save, 4)==0) {
/* this gives ownership to
pupmenu */
- uiPupMenuSaveOver(C,
handler-op, path);
+ uiPupMenuSaveOver(C,
handler-op, (path)? path: );
}
else {
int retval=
handler-op-type-exec(C, handler-op);
@@ -961,7 +961,8 @@
WM_operator_free(handler-op);
wm_event_free_handler(handler);
- MEM_freeN(path);
+ if(path)
+ MEM_freeN(path);
action= WM_HANDLER_BREAK;
}
___
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 [23542] trunk/blender/release/scripts/io/ export_fbx.py: Fix #19483: error using FBX export script, diffuse_reflection
Revision: 23542 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23542 Author: blendix Date: 2009-09-28 18:11:55 +0200 (Mon, 28 Sep 2009) Log Message: --- Fix #19483: error using FBX export script, diffuse_reflection changed to diffuse_intensity. Modified Paths: -- trunk/blender/release/scripts/io/export_fbx.py Modified: trunk/blender/release/scripts/io/export_fbx.py === --- trunk/blender/release/scripts/io/export_fbx.py 2009-09-28 16:11:06 UTC (rev 23541) +++ trunk/blender/release/scripts/io/export_fbx.py 2009-09-28 16:11:55 UTC (rev 23542) @@ -1211,13 +1211,13 @@ mat_colamb = world_amb # mat_colamb = tuple([c for c in world_amb]) - mat_dif = mat.diffuse_reflection + mat_dif = mat.diffuse_intensity # mat_dif = mat.ref mat_amb = mat.ambient # mat_amb = mat.amb mat_hard = (float(mat.specular_hardness)-1)/5.10 # mat_hard = (float(mat.hard)-1)/5.10 - mat_spec = mat.specular_reflection/2.0 + mat_spec = mat.specular_intensity/2.0 # mat_spec = mat.spec/2.0 mat_alpha = mat.alpha mat_emit = mat.emit ___ 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 [23543] trunk/blender/release/scripts/ui/ buttons_particle.py: Fix python error in boids panel, missing variable psys .
Revision: 23543 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23543 Author: blendix Date: 2009-09-28 18:13:23 +0200 (Mon, 28 Sep 2009) Log Message: --- Fix python error in boids panel, missing variable psys. Modified Paths: -- trunk/blender/release/scripts/ui/buttons_particle.py Modified: trunk/blender/release/scripts/ui/buttons_particle.py === --- trunk/blender/release/scripts/ui/buttons_particle.py2009-09-28 16:11:55 UTC (rev 23542) +++ trunk/blender/release/scripts/ui/buttons_particle.py2009-09-28 16:13:23 UTC (rev 23543) @@ -502,7 +502,8 @@ return psys.settings.physics_type=='BOIDS' def draw(self, context): - boids = context.particle_system.settings.boids + psys = context.particle_system + boids = psys.settings.boids layout = self.layout layout.enabled = particle_panel_enabled(psys) ___ 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 [23553] trunk/blender/source/creator/ CMakeLists.txt: Fix for CMake/OS X, would fail to copy files to bundle sometimes,
Revision: 23553
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23553
Author: blendix
Date: 2009-09-29 11:48:30 +0200 (Tue, 29 Sep 2009)
Log Message:
---
Fix for CMake/OS X, would fail to copy files to bundle sometimes,
doing make twice would avoid this, but that's not very convenient.
Modified Paths:
--
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/source/creator/CMakeLists.txt
===
--- trunk/blender/source/creator/CMakeLists.txt 2009-09-29 07:51:54 UTC (rev
23552)
+++ trunk/blender/source/creator/CMakeLists.txt 2009-09-29 09:48:30 UTC (rev
23553)
@@ -205,9 +205,9 @@
ADD_CUSTOM_COMMAND(
TARGET blender POST_BUILD MAIN_DEPENDENCY blender
- COMMAND cp -R ${SOURCEINFO}
${TARGETDIR}/blender.app/Contents/
- COMMAND cp -R ${SOURCEDIR}/Contents/PkgInfo
${TARGETDIR}/blender.app/Contents/
- COMMAND cp -R ${SOURCEDIR}/Contents/Resources
${TARGETDIR}/blender.app/Contents/
+ COMMAND cp -Rf ${SOURCEINFO}
${TARGETDIR}/blender.app/Contents/
+ COMMAND cp -Rf ${SOURCEDIR}/Contents/PkgInfo
${TARGETDIR}/blender.app/Contents/
+ COMMAND cp -Rf ${SOURCEDIR}/Contents/Resources
${TARGETDIR}/blender.app/Contents/
COMMAND cat ${SOURCEINFO} | sed s/VERSION/`cat
${CMAKE_SOURCE_DIR}/release/VERSION`/ | sed s/DATE/`date +'%Y-%b-%d'`/
${TARGETINFO}
COMMAND rm -Rf
${TARGETDIR}/blender.app/Contents/MacOS/.blender
COMMAND mkdir
${TARGETDIR}/blender.app/Contents/MacOS/.blender/
@@ -218,8 +218,8 @@
ADD_CUSTOM_COMMAND(
TARGET blender POST_BUILD MAIN_DEPENDENCY
blender
COMMAND cp
${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages
${TARGETDIR}/blender.app/Contents/MacOS/.blender/
- COMMAND cp -R
${CMAKE_SOURCE_DIR}/bin/.blender/locale
${TARGETDIR}/blender.app/Contents/Resources/
- COMMAND cp -R
${CMAKE_SOURCE_DIR}/bin/.blender/locale
${TARGETDIR}/blender.app/Contents/MacOS/.blender/
+ COMMAND cp -Rf
${CMAKE_SOURCE_DIR}/bin/.blender/locale
${TARGETDIR}/blender.app/Contents/Resources/
+ COMMAND cp -Rf
${CMAKE_SOURCE_DIR}/bin/.blender/locale
${TARGETDIR}/blender.app/Contents/MacOS/.blender/
COMMAND cp
${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages
${TARGETDIR}/blender.app/Contents/Resources/
)
ENDIF(WITH_INTERNATIONAL)
___
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 [23559] trunk/blender: Sorry, three commits in one, became difficult to untangle..
Revision: 23559 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23559 Author: blendix Date: 2009-09-29 21:12:12 +0200 (Tue, 29 Sep 2009) Log Message: --- Sorry, three commits in one, became difficult to untangle.. Editors Modules * render/ module added in editors, moved the preview render code there and also shading related operators. * physics/ module made more consistent with other modules. renaming files, making a single physics_ops.c for operators and keymaps. Also move all particle related operators here now. * space_buttons/ now should have only operators relevant to the buttons specificially. Updates Notifiers * Material/Texture/World/Lamp can now be passed to DAG_id_flush_update, which will go back to a callback in editors. Eventually these should be in the depsgraph itself, but for now this gives a unified call for doing updates. * GLSL materials are now refreshed on changes. There's still various cases missing, * Preview icons now hook into this system, solving various update cases that were missed before. * Also fixes issue in my last commit, where some preview would not render, problem is avoided in the new system. Icon Rendering * On systems with support for non-power of two textures, an OpenGL texture is now used instead of glDrawPixels. This avoids problems with icons get clipped on region borders. On my Linux desktop, this gives an 1.1x speedup, and on my Mac laptop a 2.3x speedup overall in redrawing the full window, with the default setup. The glDrawPixels implementation on Mac seems to have a lot of overhread. * Preview icons are now drawn using proper premul alpha, and never faded so you can see them clearly. * Also tried to fix issue with texture node preview rendering, globals can't be used with threads reliably. Modified Paths: -- trunk/blender/release/scripts/ui/buttons_particle.py trunk/blender/source/blender/blenkernel/BKE_depsgraph.h trunk/blender/source/blender/blenkernel/BKE_node.h trunk/blender/source/blender/blenkernel/intern/depsgraph.c trunk/blender/source/blender/editors/Makefile trunk/blender/source/blender/editors/SConscript trunk/blender/source/blender/editors/include/ED_particle.h trunk/blender/source/blender/editors/include/ED_physics.h trunk/blender/source/blender/editors/include/UI_interface_icons.h trunk/blender/source/blender/editors/interface/interface_icons.c trunk/blender/source/blender/editors/interface/interface_templates.c trunk/blender/source/blender/editors/interface/interface_widgets.c trunk/blender/source/blender/editors/object/object_intern.h trunk/blender/source/blender/editors/object/object_ops.c trunk/blender/source/blender/editors/physics/physics_intern.h trunk/blender/source/blender/editors/render/Makefile trunk/blender/source/blender/editors/render/SConscript trunk/blender/source/blender/editors/space_api/spacetypes.c trunk/blender/source/blender/editors/space_buttons/buttons_intern.h trunk/blender/source/blender/editors/space_buttons/buttons_ops.c trunk/blender/source/blender/editors/space_buttons/space_buttons.c trunk/blender/source/blender/editors/space_file/file_draw.c trunk/blender/source/blender/editors/space_node/node_draw.c trunk/blender/source/blender/editors/space_node/node_edit.c trunk/blender/source/blender/editors/space_node/space_node.c trunk/blender/source/blender/editors/space_view3d/space_view3d.c trunk/blender/source/blender/makesdna/DNA_modifier_types.h trunk/blender/source/blender/makesdna/DNA_object_types.h trunk/blender/source/blender/makesrna/intern/rna_brush.c trunk/blender/source/blender/makesrna/intern/rna_internal.h trunk/blender/source/blender/makesrna/intern/rna_lamp.c trunk/blender/source/blender/makesrna/intern/rna_material.c trunk/blender/source/blender/makesrna/intern/rna_texture.c trunk/blender/source/blender/makesrna/intern/rna_world.c trunk/blender/source/blender/nodes/intern/TEX_util.c trunk/blender/source/blender/nodes/intern/TEX_util.h trunk/blender/source/blender/render/intern/source/texture.c trunk/blender/source/blender/windowmanager/WM_types.h trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c Added Paths: --- trunk/blender/source/blender/editors/include/ED_render.h trunk/blender/source/blender/editors/physics/particle_boids.c trunk/blender/source/blender/editors/physics/particle_edit.c trunk/blender/source/blender/editors/physics/particle_object.c trunk/blender/source/blender/editors/physics/physics_fluid.c trunk/blender/source/blender/editors/physics/physics_ops.c trunk/blender/source/blender/editors/physics/physics_pointcache.c trunk/blender/source/blender/editors/render/ trunk/blender/source/blender/editors/render/render_intern.h
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23570] trunk/blender: Render Compositing Thread Fixes
Revision: 23570
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23570
Author: blendix
Date: 2009-09-30 20:18:32 +0200 (Wed, 30 Sep 2009)
Log Message:
---
Render Compositing Thread Fixes
* Rendering twice or more could crash layer/pass buttons.
* Compositing would crash while drawing the image.
* Rendering animations could also crash drawing the image.
* Compositing could crash
* Starting to rendering while preview render / compo was
still running could crash.
* Exiting while rendering an animation would not abort the
renderer properly, making Blender seemingly freeze.
* Fixes theoretically possible issue with setting malloc
lock with nested threads.
* Drawing previews inside nodes could crash when those nodes
were being rendered at the same time.
There's more crashes, manipulating the scene data or undo can
still crash, this commit only focuses on making sure the image
buffer and render result access is thread safe.
Implementation:
* Rather than assuming the render result does not get freed
during render, which seems to be quite difficult to do given
that e.g. the compositor is allowed to change the size of
the buffer or output different passes, the render result is
now protected with a read/write mutex.
* The read/write mutex allows multiple readers (and pixel
writers) at the same time, but only allows one writer to
manipulate the data structure.
* Added BKE_image_acquire_ibuf/BKE_image_release_ibuf to access
images being rendered, cases where this is not needed (most
code) can still use BKE_image_get_ibuf.
* The job manager now allows only one rendering job at the same
time, rather than the G.rendering check which was not reliable.
Modified Paths:
--
trunk/blender/intern/guardedalloc/intern/mallocn.c
trunk/blender/source/blender/blenkernel/BKE_image.h
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenkernel/intern/sequence.c
trunk/blender/source/blender/blenlib/BLI_threads.h
trunk/blender/source/blender/blenlib/intern/threads.c
trunk/blender/source/blender/editors/include/ED_image.h
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/screen/screendump.c
trunk/blender/source/blender/editors/space_file/writeimage.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_image/image_draw.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
trunk/blender/source/blender/nodes/intern/CMP_util.c
trunk/blender/source/blender/render/extern/include/RE_pipeline.h
trunk/blender/source/blender/render/intern/include/render_types.h
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/sss.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm_jobs.c
Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===
--- trunk/blender/intern/guardedalloc/intern/mallocn.c 2009-09-30 17:13:57 UTC
(rev 23569)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c 2009-09-30 18:18:32 UTC
(rev 23570)
@@ -688,17 +688,35 @@
uintptr_t MEM_get_memory_in_use(void)
{
- return mem_in_use;
+ uintptr_t _mem_in_use;
+
+ mem_lock_thread();
+ _mem_in_use= mem_in_use;
+ mem_unlock_thread();
+
+ return _mem_in_use;
}
uintptr_t MEM_get_mapped_memory_in_use(void)
{
- return mmap_in_use;
+ uintptr_t _mmap_in_use;
+
+ mem_lock_thread();
+ _mmap_in_use= mmap_in_use;
+ mem_unlock_thread();
+
+ return _mmap_in_use;
}
int MEM_get_memory_blocks_in_use(void)
{
- return totblock;
+ int _totblock;
+
+ mem_lock_thread();
+ _totblock= totblock;
+ mem_unlock_thread();
+
+ return _totblock;
}
/* eof */
Modified: trunk/blender/source/blender/blenkernel/BKE_image.h
===
--- trunk/blender/source/blender/blenkernel/BKE_image.h 2009-09-30 17:13:57 UTC
(rev 23569)
+++ trunk/blender/source/blender/blenkernel/BKE_image.h 2009-09-30 18:18:32 UTC
(rev 23570)
@@ -107,6 +107,11 @@
/* always call to make
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23581] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Fix #19513: scroll wheel did not work when over disabled buttons.
Revision: 23581
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23581
Author: blendix
Date: 2009-10-01 14:33:35 +0200 (Thu, 01 Oct 2009)
Log Message:
---
Fix #19513: scroll wheel did not work when over disabled buttons.
Modified Paths:
--
trunk/blender/source/blender/editors/interface/interface_handlers.c
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===
--- trunk/blender/source/blender/editors/interface/interface_handlers.c
2009-10-01 11:21:40 UTC (rev 23580)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c
2009-10-01 12:33:35 UTC (rev 23581)
@@ -3271,7 +3271,7 @@
retval= WM_UI_HANDLER_CONTINUE;
if(but-flag UI_BUT_DISABLED)
- return WM_UI_HANDLER_BREAK;
+ return WM_UI_HANDLER_CONTINUE;
if(data-state == BUTTON_STATE_HIGHLIGHT) {
/* handle copy-paste */
___
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 [23586] trunk/blender/source/blender/ editors/physics/particle_edit.c: Fix crashes with . blend files saved in particle mode, derivedmesh
Revision: 23586
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23586
Author: blendix
Date: 2009-10-01 18:30:05 +0200 (Thu, 01 Oct 2009)
Log Message:
---
Fix crashes with .blend files saved in particle mode, derivedmesh
can't be assumed to be made yet then.
Modified Paths:
--
trunk/blender/source/blender/editors/physics/particle_edit.c
Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===
--- trunk/blender/source/blender/editors/physics/particle_edit.c
2009-10-01 16:06:10 UTC (rev 23585)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c
2009-10-01 16:30:05 UTC (rev 23586)
@@ -110,14 +110,11 @@
{
Scene *scene= CTX_data_scene(C);
Object *ob= CTX_data_active_object(C);
- PTCacheEdit *edit;
- if(!scene || !ob)
+ if(!scene || !ob || !(ob-mode OB_MODE_PARTICLE_EDIT))
return 0;
- edit= PE_get_current(scene, ob);
-
- return (edit (ob-mode OB_MODE_PARTICLE_EDIT));
+ return (PE_get_current(scene, ob) != NULL);
}
int PE_hair_poll(bContext *C)
@@ -126,12 +123,12 @@
Object *ob= CTX_data_active_object(C);
PTCacheEdit *edit;
- if(!scene || !ob)
+ if(!scene || !ob || !(ob-mode OB_MODE_PARTICLE_EDIT))
return 0;
edit= PE_get_current(scene, ob);
- return (edit edit-psys (ob-mode OB_MODE_PARTICLE_EDIT));
+ return (edit edit-psys);
}
int PE_poll_3dview(bContext *C)
@@ -675,6 +672,9 @@
psmd= psys_get_modifier(ob, psys);
totpart= psys-totpart;
+ if(!psmd-dm)
+ return;
+
tree= BLI_kdtree_new(totpart);
/* insert particles into kd tree */
@@ -803,6 +803,9 @@
edit= psys-edit;
psmd= psys_get_modifier(ob, psys);
+ if(!edit-mirror_cache || !psmd-dm)
+ return;
+
/* we delay settings the PARS_EDIT_RECALC for mirrored particles
* to avoid doing mirror twice */
LOOP_POINTS {
@@ -841,6 +844,9 @@
psys = edit-psys;
psmd = psys_get_modifier(ob,psys);
+ if(!psmd-dm)
+ return;
+
LOOP_EDITED_POINTS {
psys_mat_hair_to_object(ob, psmd-dm, psys-part-from,
psys-particles + p, hairmat);
@@ -994,6 +1000,9 @@
float *vec, *nor;
int i, totface, totvert;
+ if(!dm)
+ return;
+
if(edit-emitter_cosnos)
MEM_freeN(edit-emitter_cosnos);
@@ -1079,7 +1088,7 @@
POINT_P; KEY_K;
float hairmat[4][4];
- if(psys==0 || psys-edit==0)
+ if(psys==0 || psys-edit==0 || psmd-dm==NULL)
return;
LOOP_POINTS {
@@ -2444,6 +2453,8 @@
return;
psmd= psys_get_modifier(ob, psys);
+ if(!psmd-dm)
+ return;
mirrorfaces= mesh_get_x_mirror_faces(ob, NULL);
___
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 [23589] trunk/blender: Texture stack influences are now all separate values, and negative
Revision: 23589
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23589
Author: blendix
Date: 2009-10-01 19:15:23 +0200 (Thu, 01 Oct 2009)
Log Message:
---
Texture stack influences are now all separate values, and negative
mapped values now have their influence negated instead. Also a few
RNA changes for TextureSlot.
Bumped subversion for the version patch.
Modified Paths:
--
trunk/blender/release/scripts/ui/buttons_texture.py
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/gpu/intern/gpu_shader_material.glsl
trunk/blender/source/blender/makesdna/DNA_material_types.h
trunk/blender/source/blender/makesdna/DNA_texture_types.h
trunk/blender/source/blender/makesrna/intern/rna_brush.c
trunk/blender/source/blender/makesrna/intern/rna_internal.h
trunk/blender/source/blender/makesrna/intern/rna_lamp.c
trunk/blender/source/blender/makesrna/intern/rna_material.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/blender/makesrna/intern/rna_world.c
trunk/blender/source/blender/render/extern/include/RE_render_ext.h
trunk/blender/source/blender/render/extern/include/RE_shader_ext.h
trunk/blender/source/blender/render/intern/source/renderdatabase.c
trunk/blender/source/blender/render/intern/source/texture.c
Modified: trunk/blender/release/scripts/ui/buttons_texture.py
===
--- trunk/blender/release/scripts/ui/buttons_texture.py 2009-10-01 16:37:08 UTC
(rev 23588)
+++ trunk/blender/release/scripts/ui/buttons_texture.py 2009-10-01 17:15:23 UTC
(rev 23589)
@@ -175,14 +175,14 @@
row.itemR(tex, z_mapping, text=)
if br:
- layout.itemR(tex, brush_map_mode, expand=True)
+ layout.itemR(tex, map_mode, expand=True)
row = layout.row()
- row.active = tex.brush_map_mode in ('FIXED', 'TILED')
+ row.active = tex.map_mode in ('FIXED', 'TILED')
row.itemR(tex, angle)
row = layout.row()
- row.active = tex.brush_map_mode in ('TILED', '3D')
+ row.active = tex.map_mode in ('TILED', '3D')
row.column().itemR(tex, size)
else:
row = layout.row()
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2009-10-01
16:37:08 UTC (rev 23588)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2009-10-01
17:15:23 UTC (rev 23589)
@@ -43,7 +43,7 @@
struct ReportList;
#define BLENDER_VERSION250
-#define BLENDER_SUBVERSION 3
+#define BLENDER_SUBVERSION 4
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2009-10-01
16:37:08 UTC (rev 23588)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2009-10-01
17:15:23 UTC (rev 23589)
@@ -2057,7 +2057,7 @@
}
static void do_path_effectors(ParticleSimulationData *sim, int i,
ParticleCacheKey *ca, int k, int steps, float *rootco, float effector, float
dfra, float cfra, float *length, float *vec)
{
- float force[3] = {0.0f,0.0f,0.0f}, vel[3] = {0.0f,0.0f,0.0f};
+ float force[3] = {0.0f,0.0f,0.0f};
ParticleKey eff_key;
EffectedPoint epoint;
@@ -3410,9 +3410,7 @@
mtex=ma-mtex[m];
if(mtex (ma-septex (1m))==0 mtex-pmapto){
float def=mtex-def_var;
- float var=mtex-varfac;
short blend=mtex-blendtype;
- short neg=mtex-pmaptoneg;
if((mtex-texco TEXCO_UV) fw) {
if(!get_particle_uv(dm, NULL, face_index, fw,
mtex-uvname, texco))
@@ -3427,18 +3425,18 @@
ptex-time=0.0;
setvars|=MAP_PA_TIME;
}
- ptex-time=
texture_value_blend(mtex-def_var,ptex-time,value,var,blend,neg MAP_PA_TIME);
+ ptex-time=
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23590] trunk/blender/source/blender: Fix cmake compilation on Windows, adding pthread includes,
Revision: 23590
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23590
Author: blendix
Date: 2009-10-01 19:24:24 +0200 (Thu, 01 Oct 2009)
Log Message:
---
Fix cmake compilation on Windows, adding pthread includes,
patch by Guillaume, thanks!
Modified Paths:
--
trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/render/CMakeLists.txt
Modified: trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
===
--- trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2009-10-01
17:15:23 UTC (rev 23589)
+++ trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2009-10-01
17:24:24 UTC (rev 23590)
@@ -30,6 +30,10 @@
. .. ../../../intern/guardedalloc ../blenlib ../imbuf ../makesdna
)
+IF(WIN32)
+ SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
IF(WITH_QUICKTIME)
SET(INC ${INC} ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME)
Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2009-10-01
17:15:23 UTC (rev 23589)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2009-10-01
17:24:24 UTC (rev 23590)
@@ -42,6 +42,10 @@
INCLUDE_DIRECTORIES(../../../../intern/guardedalloc .. ../../makesdna
../../blenkernel ../../blenlib ../../ikplugin ../../windowmanager
../../editors/include ../../imbuf ../../render/extern/include .)
FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h)
+IF(WIN32)
+ SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
IF(WITH_GAMEENGINE)
ADD_DEFINITIONS(-DGAMEBLENDER)
ENDIF(WITH_GAMEENGINE)
Modified: trunk/blender/source/blender/nodes/CMakeLists.txt
===
--- trunk/blender/source/blender/nodes/CMakeLists.txt 2009-10-01 17:15:23 UTC
(rev 23589)
+++ trunk/blender/source/blender/nodes/CMakeLists.txt 2009-10-01 17:24:24 UTC
(rev 23590)
@@ -34,6 +34,10 @@
${ZLIB_INC}
)
+IF(WIN32)
+ SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
IF(WITH_OPENEXR)
ADD_DEFINITIONS(-DWITH_OPENEXR)
ENDIF(WITH_OPENEXR)
Modified: trunk/blender/source/blender/render/CMakeLists.txt
===
--- trunk/blender/source/blender/render/CMakeLists.txt 2009-10-01 17:15:23 UTC
(rev 23589)
+++ trunk/blender/source/blender/render/CMakeLists.txt 2009-10-01 17:24:24 UTC
(rev 23590)
@@ -34,6 +34,10 @@
../makesrna
)
+IF(WIN32)
+ SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
IF(WITH_OPENEXR)
ADD_DEFINITIONS(-DWITH_OPENEXR)
ENDIF(WITH_OPENEXR)
___
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 [23598] trunk/blender/source/blender: Fix #19311: adding/opening datablocks did not always make the right
Revision: 23598
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23598
Author: blendix
Date: 2009-10-02 01:32:57 +0200 (Fri, 02 Oct 2009)
Log Message:
---
Fix #19311: adding/opening datablocks did not always make the right
one active. Now there's a function to get the pointer + property from
the UI, just like for the animation operators.
Also two fixes for fileselect events, regions are now preserved so that
context is restored to the old region, and the cancel callback is called
when the operator is cancelled.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/world.c
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/physics/particle_boids.c
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/space_action/action_edit.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/makesrna/RNA_types.h
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/blenkernel/intern/world.c
===
--- trunk/blender/source/blender/blenkernel/intern/world.c 2009-10-01
22:35:07 UTC (rev 23597)
+++ trunk/blender/source/blender/blenkernel/intern/world.c 2009-10-01
23:32:57 UTC (rev 23598)
@@ -86,15 +86,20 @@
wrld= alloc_libblock(G.main-world, ID_WO, name);
- wrld-horb= 0.6f;
- wrld-skytype= WO_SKYBLEND;
+ wrld-horr= 0.25f;
+ wrld-horg= 0.25f;
+ wrld-horb= 0.25f;
+ wrld-zenr= 0.1f;
+ wrld-zeng= 0.1f;
+ wrld-zenb= 0.1f;
+ wrld-skytype= 0;
wrld-stardist= 15.0f;
wrld-starsize= 2.0f;
wrld-exp= 0.0f;
wrld-exposure=wrld-range= 1.0f;
- wrld-aodist= 5.0f;
+ wrld-aodist= 10.0f;
wrld-aosamp= 5;
wrld-aoenergy= 1.0f;
wrld-aobias= 0.05f;
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===
--- trunk/blender/source/blender/editors/include/UI_interface.h 2009-10-01
22:35:07 UTC (rev 23597)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2009-10-01
23:32:57 UTC (rev 23598)
@@ -670,6 +670,7 @@
/* Helpers for Operators */
void uiAnimContextProperty(const struct bContext *C, struct PointerRNA *ptr,
struct PropertyRNA **prop, int *index);
void uiFileBrowseContextProperty(const struct bContext *C, struct PointerRNA
*ptr, struct PropertyRNA **prop);
+void uiIDContextProperty(struct bContext *C, struct PointerRNA *ptr, struct
PropertyRNA **prop);
/* Styled text draw */
void uiStyleFontSet(struct uiFontStyle *fs);
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===
--- trunk/blender/source/blender/editors/interface/interface_templates.c
2009-10-01 22:35:07 UTC (rev 23597)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c
2009-10-01 23:32:57 UTC (rev 23598)
@@ -153,6 +153,36 @@
/ ID Template ***/
+/* for new/open operators */
+void uiIDContextProperty(bContext *C, PointerRNA *ptr, PropertyRNA **prop)
+{
+ TemplateID *template;
+ ARegion *ar= CTX_wm_region(C);
+ uiBlock *block;
+ uiBut *but;
+
+ memset(ptr, 0, sizeof(*ptr));
+ *prop= NULL;
+
+ if(!ar)
+ return;
+
+ for(block=ar-uiblocks.first; block; block=block-next) {
+ for(but=block-buttons.first; but; but= but-next) {
+ /* find the button before the active one */
+ if((but-flag (UI_BUT_LAST_ACTIVE|UI_ACTIVE))) {
+ if(but-func_argN) {
+ template= but-func_argN;
+ *ptr= template-ptr;
+ *prop= template-prop;
+ return;
+ }
+ }
+ }
+ }
+}
+
+
static void template_id_cb(bContext *C, void *arg_litem, void *arg_event)
{
TemplateID *template= (TemplateID*)arg_litem;
@@ -167,11 +197,7 @@
break;
case UI_ID_OPEN:
case UI_ID_ADD_NEW:
- if(template-idlb-last) {
- RNA_id_pointer_create(template-idlb-last,
idptr);
- RNA_property_pointer_set(template-ptr,
template-prop, idptr);
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23637] branches/soc-2009-jaguarandi: Raytrace Acceleration: small tweak to RNA and UI, hiding buttons
Revision: 23637
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23637
Author: blendix
Date: 2009-10-05 18:18:08 +0200 (Mon, 05 Oct 2009)
Log Message:
---
Raytrace Acceleration: small tweak to RNA and UI, hiding buttons
when they are not applicable.
Modified Paths:
--
branches/soc-2009-jaguarandi/release/scripts/ui/buttons_scene.py
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_scene.c
Modified: branches/soc-2009-jaguarandi/release/scripts/ui/buttons_scene.py
===
--- branches/soc-2009-jaguarandi/release/scripts/ui/buttons_scene.py
2009-10-05 15:59:12 UTC (rev 23636)
+++ branches/soc-2009-jaguarandi/release/scripts/ui/buttons_scene.py
2009-10-05 16:18:08 UTC (rev 23637)
@@ -173,9 +173,11 @@
sub.active = rd.render_raytracing
sub.itemL(text=Acceleration structure:)
sub.itemR(rd, raytrace_structure, text=)
- sub.itemR(rd, use_instances, text=Instance support)
- sub.itemR(rd, use_local_coords, text=Local coords)
- sub.itemR(rd, octree_resolution, text=Octree resolution)
+ if rd.raytrace_structure == OCTREE:
+ sub.itemR(rd, octree_resolution, text=Resolution)
+ else:
+ sub.itemR(rd, use_instances, text=Instances)
+ sub.itemR(rd, use_local_coords, text=Local Coordinates)
class SCENE_PT_post_processing(RenderButtonsPanel):
__label__ = Post Processing
Modified:
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_scene.c
===
--- branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_scene.c
2009-10-05 15:59:12 UTC (rev 23636)
+++ branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_scene.c
2009-10-05 16:18:08 UTC (rev 23637)
@@ -1179,12 +1179,12 @@
{0, NULL, 0, NULL, NULL}};
static EnumPropertyItem raytrace_structure_items[] = {
- {R_RAYSTRUCTURE_AUTO, {R_RAYSTRUCTURE_AUTO, 0, auto, },
- {R_RAYSTRUCTURE_OCTREE, R_RAYSTRUCTURE_OCTREE, 0, octree,
Use old octree structure (no support for instances)},
- {R_RAYSTRUCTURE_BLIBVH, R_RAYSTRUCTURE_BLIBVH, 0, blibvh,
Use BLI_kdopbvh.c},
- {R_RAYSTRUCTURE_VBVH, R_RAYSTRUCTURE_VBVH, 0, vBVH, },
- {R_RAYSTRUCTURE_SIMD_SVBVH, R_RAYSTRUCTURE_SIMD_SVBVH, 0,
SIMD SVBVH, Requires SIMD},
- {R_RAYSTRUCTURE_SIMD_QBVH, R_RAYSTRUCTURE_SIMD_QBVH, 0, SIMD
QBVH, Requires SIMD},
+ {R_RAYSTRUCTURE_AUTO, AUTO, 0, Auto, },
+ {R_RAYSTRUCTURE_OCTREE, OCTREE, 0, Octree, Use old Octree
structure.},
+ {R_RAYSTRUCTURE_BLIBVH, BLIBVH, 0, BLI BVH, Use BLI K-Dop
BVH.c},
+ {R_RAYSTRUCTURE_VBVH, VBVH, 0, vBVH, },
+ {R_RAYSTRUCTURE_SIMD_SVBVH, SIMD_SVBVH, 0, SIMD SVBVH, },
+ {R_RAYSTRUCTURE_SIMD_QBVH, SIMD_QBVH, 0, SIMD QBVH, },
{0, NULL, 0, NULL, NULL}
};
@@ -1632,7 +1632,6 @@
RNA_def_property_ui_text(prop, Use Local Coords, Vertex coordinates
are stored localy on each primitive. Increases memory usage, but may have
impact on speed.);
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
-
prop= RNA_def_property(srna, antialiasing, PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, mode, R_OSA);
RNA_def_property_ui_text(prop, Anti-Aliasing, Render and combine
multiple samples per pixel to prevent jagged edges.);
___
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 [23638] trunk/blender/source/blender: VBO: disable VBO's by default.
Revision: 23638
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23638
Author: blendix
Date: 2009-10-05 18:40:13 +0200 (Mon, 05 Oct 2009)
Log Message:
---
VBO: disable VBO's by default. Not sure why this was not done, we
agreed on this as a condition for the project to be merged.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/editors/interface/resources.c
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2009-10-05
16:18:08 UTC (rev 23637)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2009-10-05
16:40:13 UTC (rev 23638)
@@ -43,7 +43,7 @@
struct ReportList;
#define BLENDER_VERSION250
-#define BLENDER_SUBVERSION 4
+#define BLENDER_SUBVERSION 5
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: trunk/blender/source/blender/editors/interface/resources.c
===
--- trunk/blender/source/blender/editors/interface/resources.c 2009-10-05
16:18:08 UTC (rev 23637)
+++ trunk/blender/source/blender/editors/interface/resources.c 2009-10-05
16:40:13 UTC (rev 23638)
@@ -1259,6 +1259,9 @@
if(U.audiorate == 0)
U.audiorate = 44100;
}
+
+ if (G.main-versionfile 250 || (G.main-versionfile == 250
G.main-subversionfile 5))
+ U.gameflags |= USER_DISABLE_VBO;
/* GL Texture Garbage Collection (variable abused above!) */
if (U.textimeout == 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 [23639] trunk/blender/source/blender/gpu/ intern/gpu_buffers.c: VBO:
Revision: 23639
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23639
Author: blendix
Date: 2009-10-05 18:48:52 +0200 (Mon, 05 Oct 2009)
Log Message:
---
VBO:
* Fix slowdown/freeze entering editmode on a high poly mesh,
dm-getNumFaces can be slow, don't call it in a loop.
* Fix 64bit pointer casting warnings.
Modified Paths:
--
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
Modified: trunk/blender/source/blender/gpu/intern/gpu_buffers.c
===
--- trunk/blender/source/blender/gpu/intern/gpu_buffers.c 2009-10-05
16:40:13 UTC (rev 23638)
+++ trunk/blender/source/blender/gpu/intern/gpu_buffers.c 2009-10-05
16:48:52 UTC (rev 23639)
@@ -34,15 +34,19 @@
#include GL/glew.h
-#include DNA_userdef_types.h
+#include MEM_guardedalloc.h
-#include gpu_buffers.h
-#include MEM_guardedalloc.h
+#include BLI_arithb.h
+
+#include DNA_meshdata_types.h
+
#include BKE_DerivedMesh.h
#include BKE_utildefines.h
-#include DNA_meshdata_types.h
-#include BLI_arithb.h
+#include DNA_userdef_types.h
+
+#include gpu_buffers.h
+
#define GPU_BUFFER_VERTEX_STATE 1
#define GPU_BUFFER_NORMAL_STATE 2
#define GPU_BUFFER_TEXCOORD_STATE 4
@@ -248,7 +252,7 @@
int redir[32768]; /* material number is an 16-bit short
so there's at most 32768 materials */
int *index;
int i;
- int curmat, curverts;
+ int curmat, curverts, numfaces;
DEBUG_VBO(GPU_drawobject_new\n);
@@ -267,7 +271,8 @@
mvert = dm-getVertArray(dm);
mface = dm-getFaceArray(dm);
- for( i=0; i dm-getNumFaces(dm); i++ ) {
+ numfaces= dm-getNumFaces(dm);
+ for( i=0; i numfaces; i++ ) {
if( mface[i].v4 )
numverts[mface[i].mat_nr+16383] += 6; /* split every
quad into two triangles */
else
@@ -313,7 +318,7 @@
object-indexMemUsage++; \
}
- for( i=0; i dm-getNumFaces(dm); i++ ) {
+ for( i=0; i numfaces; i++ ) {
int curInd = index[redir[mface[i].mat_nr+16383]];
object-faceRemap[curInd] = i;
ADDLINK( mface[i].v1, curInd*3 );
@@ -461,7 +466,7 @@
void GPU_buffer_copy_vertex( DerivedMesh *dm, float *varray, int *index, int
*redir, void *user )
{
int start;
- int i, j;
+ int i, j, numfaces;
MVert *mvert;
MFace *mface;
@@ -471,7 +476,8 @@
mvert = dm-getVertArray(dm);
mface = dm-getFaceArray(dm);
- for( i=0; i dm-getNumFaces(dm); i++ ) {
+ numfaces= dm-getNumFaces(dm);
+ for( i=0; i numfaces; i++ ) {
start = index[redir[mface[i].mat_nr+16383]];
if( mface[i].v4 )
index[redir[mface[i].mat_nr+16383]] += 18;
@@ -508,7 +514,7 @@
void GPU_buffer_copy_normal( DerivedMesh *dm, float *varray, int *index, int
*redir, void *user )
{
- int i;
+ int i, numfaces;
int start;
float norm[3];
@@ -518,7 +524,8 @@
DEBUG_VBO(GPU_buffer_copy_normal\n);
- for( i=0; i dm-getNumFaces(dm); i++ ) {
+ numfaces= dm-getNumFaces(dm);
+ for( i=0; i numfaces; i++ ) {
start = index[redir[mface[i].mat_nr+16383]];
if( mface[i].v4 )
index[redir[mface[i].mat_nr+16383]] += 18;
@@ -572,7 +579,7 @@
void GPU_buffer_copy_uv( DerivedMesh *dm, float *varray, int *index, int
*redir, void *user )
{
int start;
- int i;
+ int i, numfaces;
MTFace *mtface;
MFace *mface;
@@ -587,7 +594,8 @@
return;
}
- for( i=0; i dm-getNumFaces(dm); i++ ) {
+ numfaces= dm-getNumFaces(dm);
+ for( i=0; i numfaces; i++ ) {
start = index[redir[mface[i].mat_nr+16383]];
if( mface[i].v4 )
index[redir[mface[i].mat_nr+16383]] += 12;
@@ -619,14 +627,15 @@
void GPU_buffer_copy_color3( DerivedMesh *dm, float *varray_, int *index, int
*redir, void *user )
{
- int i;
+ int i, numfaces;
unsigned char *varray = (unsigned char *)varray_;
unsigned char *mcol = (unsigned char *)user;
MFace *mface = dm-getFaceArray(dm);
DEBUG_VBO(GPU_buffer_copy_color3\n);
- for( i=0; i dm-getNumFaces(dm); i++ ) {
+ numfaces= dm-getNumFaces(dm);
+ for( i=0; i numfaces; i++ ) {
int start = index[redir[mface[i].mat_nr+16383]];
if( mface[i].v4 )
index[redir[mface[i].mat_nr+16383]] += 18;
@@ -648,14 +657,15 @@
void GPU_buffer_copy_color4( DerivedMesh *dm, float *varray_, int *index, int
*redir, void *user )
{
- int i;
+ int i, numfaces;
unsigned char *varray = (unsigned char *)varray_;
unsigned char *mcol =
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23640] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: VBO:
Revision: 23640
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23640
Author: blendix
Date: 2009-10-05 19:29:56 +0200 (Mon, 05 Oct 2009)
Log Message:
---
VBO:
* Disable use of EditMeshDerivedMesh for VBO drawing in editmode.
This is crashed when using e.g. subsurf in editmode, as the DM
is not an EditMeshDerivedMesh.
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-10-05 16:48:52 UTC (rev 23639)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c
2009-10-05 17:29:56 UTC (rev 23640)
@@ -1552,6 +1552,12 @@
}
}
}
+
+/* disabled because it crashes combined with e.g. subsurf modifier,
+ * the derivedmesh can't be assumed to be an EditMeshDerivedMesh,
+ * nor should this struct be copied around, it should be defined in
+ * a single place only to avoid them getting out of sync */
+#if 0
/* originally defined in DerivedMesh.c */
typedef struct {
DerivedMesh dm;
@@ -1561,15 +1567,17 @@
float (*vertexNos)[3];
float (*faceNos)[3];
} EditMeshDerivedMesh;
+#endif
static void draw_dm_verts(DerivedMesh *dm, int sel, EditVert *eve_act)
{
struct { int sel; EditVert *eve_act; } data;
- GPUBuffer *buffer;
- float *varray;
+ //GPUBuffer *buffer;
+ //float *varray;
data.sel = sel;
data.eve_act = eve_act;
+#if 0
/* first come the unselected vertices, then the selected */
buffer = GPU_buffer_legacy(dm)?0:GPU_buffer_alloc(
sizeof(float)*3*dm-getNumVerts(dm)*2, 0 );
@@ -1612,12 +1620,15 @@
UI_ThemeColor4(data.sel?TH_VERTEX_SELECT:TH_VERTEX);
GPU_buffer_unbind();
}
- else {
+ {
+#endif
bglBegin(GL_POINTS);
dm-foreachMappedVert(dm, draw_dm_verts__mapFunc, data);
bglEnd();
+#if 0
}
GPU_buffer_free( buffer, 0 );
+#endif
}
/* Draw edges with color set based on selection */
@@ -1688,15 +1699,14 @@
static void draw_dm_edges_sel_interp(DerivedMesh *dm, unsigned char *baseCol,
unsigned char *selCol)
{
- unsigned char *cols[2];
+ unsigned char *cols[2] = {baseCol, selCol};
+#if 0
int elemsize = sizeof(float)*3+sizeof(unsigned char)*4;
EditMeshDerivedMesh *emdm = (EditMeshDerivedMesh *)dm;
EditMesh *em= emdm-em;
unsigned char *varray;
int i;
GPUBuffer *buffer;
- cols[0] = baseCol;
- cols[1] = selCol;
buffer = GPU_buffer_legacy(dm)?0:GPU_buffer_alloc(
elemsize*em-totedge*2, 0 );
if( (varray = GPU_buffer_lock_stream( buffer )) ) {
@@ -1733,9 +1743,12 @@
GPU_buffer_unbind();
}
else {
+#endif
dm-drawMappedEdgesInterp(dm,
draw_dm_edges_sel_interp__setDrawOptions,
draw_dm_edges_sel_interp__setDrawInterpOptions, cols);
+#if 0
}
GPU_buffer_free( buffer, 0 );
+#endif
}
/* Draw only seam edges */
@@ -1792,11 +1805,10 @@
//EditMeshDerivedMesh *emdm = (EditMeshDerivedMesh *)dm;
EditFace *efa;
unsigned char *col;
- unsigned char *colors;
GPUBuffer *buffer;
unsigned char *varray;
unsigned char black[] = { 0, 0, 0, 0 };
- int i,j,draw=0;
+ int i, draw=0;
int elemsize = (sizeof(float)*6+sizeof(unsigned char)*4);
data.cols[0] = baseCol;
data.cols[1] = selCol;
@@ -4039,7 +4051,6 @@
glLineWidth(1.0f);
}
else if(ELEM(draw_as, 0, PART_DRAW_CIRC)==0){
- int point_size = 1;
glDisableClientState(GL_COLOR_ARRAY);
/* enable point data array */
___
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 [23667] trunk/blender/source/blender/ makesrna/intern/rna_constraint.c: Bugfix: IK constraint pole angle range was not correct.
Revision: 23667
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23667
Author: blendix
Date: 2009-10-06 19:15:10 +0200 (Tue, 06 Oct 2009)
Log Message:
---
Bugfix: IK constraint pole angle range was not correct.
Modified Paths:
--
trunk/blender/source/blender/makesrna/intern/rna_constraint.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_constraint.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_constraint.c
2009-10-06 17:01:00 UTC (rev 23666)
+++ trunk/blender/source/blender/makesrna/intern/rna_constraint.c
2009-10-06 17:15:10 UTC (rev 23667)
@@ -87,7 +87,7 @@
{0, NULL, 0, NULL, NULL},
};
-static EnumPropertyItem constraint_distance_items[] = {
+EnumPropertyItem constraint_distance_items[] = {
{LIMITDIST_INSIDE, LIMITDIST_INSIDE, 0, Inside, },
{LIMITDIST_OUTSIDE, LIMITDIST_OUTSIDE, 0, Outside, },
{LIMITDIST_ONSURFACE, LIMITDIST_ONSURFACE, 0, On Surface, },
@@ -453,7 +453,7 @@
prop= RNA_def_property(srna, pole_angle, PROP_FLOAT, PROP_ANGLE); //
XXX - todo, convert to rad
RNA_def_property_float_sdna(prop, NULL, poleangle);
- RNA_def_property_range(prop, 0.0, 180.f);
+ RNA_def_property_range(prop, -180.0f, 180.f);
RNA_def_property_ui_text(prop, Pole Angle, Pole rotation offset.);
RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT,
rna_Constraint_update);
___
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 [23684] trunk/blender/source/blender/ editors/object/object_ops.c: Bugfix: move to layer was not assigned to M key yet.
Revision: 23684 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23684 Author: blendix Date: 2009-10-07 12:54:43 +0200 (Wed, 07 Oct 2009) Log Message: --- Bugfix: move to layer was not assigned to M key yet. Modified Paths: -- trunk/blender/source/blender/editors/object/object_ops.c Modified: trunk/blender/source/blender/editors/object/object_ops.c === --- trunk/blender/source/blender/editors/object/object_ops.c2009-10-07 09:55:18 UTC (rev 23683) +++ trunk/blender/source/blender/editors/object/object_ops.c2009-10-07 10:54:43 UTC (rev 23684) @@ -241,6 +241,8 @@ WM_keymap_add_item(keymap, OBJECT_OT_restrictview_clear, HKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, OBJECT_OT_restrictview_set, HKEY, KM_PRESS, 0, 0); RNA_boolean_set(WM_keymap_add_item(keymap, OBJECT_OT_restrictview_set, HKEY, KM_PRESS, KM_SHIFT, 0)-ptr, unselected, 1); + + WM_keymap_add_item(keymap, OBJECT_OT_move_to_layer, MKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, OBJECT_OT_delete, XKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, OBJECT_OT_delete, DELKEY, KM_PRESS, 0, 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 [23690] trunk/blender/source/blender: Preview Render:
Revision: 23690
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23690
Author: blendix
Date: 2009-10-07 16:48:29 +0200 (Wed, 07 Oct 2009)
Log Message:
---
Preview Render:
* Fixes for texture and material nodes.
* Texture node previews now work more like materials.
Modified Paths:
--
trunk/blender/source/blender/editors/include/ED_render.h
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/space_node/space_node.c
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesrna/intern/rna_material.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_at.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_image.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_output.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
trunk/blender/source/blender/nodes/intern/TEX_util.c
trunk/blender/source/blender/nodes/intern/TEX_util.h
trunk/blender/source/blender/render/intern/source/shadeinput.c
trunk/blender/source/blender/render/intern/source/texture.c
Modified: trunk/blender/source/blender/editors/include/ED_render.h
===
--- trunk/blender/source/blender/editors/include/ED_render.h2009-10-07
14:40:27 UTC (rev 23689)
+++ trunk/blender/source/blender/editors/include/ED_render.h2009-10-07
14:48:29 UTC (rev 23690)
@@ -64,21 +64,19 @@
/* Render the preview
pr_method:
-- PR_DRAW_RENDER: preview is rendered and drawn, as indicated by called
context (buttons panel)
-- PR_ICON_RENDER: the preview is not drawn and the function is not dynamic,
- so no events are processed. Hopefully fast enough for at least 32x32
-- PR_DO_RENDER: preview is rendered, not drawn, but events are processed for
afterqueue,
- in use for node editor now.
+- PR_BUTS_RENDER: preview is rendered for buttons window
+- PR_ICON_RENDER: preview is rendered for icons. hopefully fast enough for at
least 32x32
+- PR_NODE_RENDER: preview is rendered for node editor.
*/
-#define PR_DRAW_RENDER 0
+#define PR_BUTS_RENDER 0
#define PR_ICON_RENDER 1
-#define PR_DO_RENDER 2
+#define PR_NODE_RENDER 2
void ED_preview_init_dbase(void);
void ED_preview_free_dbase(void);
-void ED_preview_shader_job(const struct bContext *C, void *owner, struct ID
*id, struct ID *parent, struct MTex *slot, int sizex, int sizey);
+void ED_preview_shader_job(const struct bContext *C, void *owner, struct ID
*id, struct ID *parent, struct MTex *slot, int sizex, int sizey, int method);
void ED_preview_icon_job(const struct bContext *C, void *owner, struct ID *id,
unsigned int *rect, int sizex, int sizey);
void ED_preview_draw(const struct bContext *C, void *idp, void *parentp, void
*slot, rcti *rect);
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===
--- trunk/blender/source/blender/editors/render/render_preview.c
2009-10-07 14:40:27 UTC (rev 23689)
+++ trunk/blender/source/blender/editors/render/render_preview.c
2009-10-07 14:48:29 UTC (rev 23690)
@@ -359,7 +359,7 @@
}
else {
sce-lay= 1mat-pr_type;
- if(mat-nodetree)
+ if(mat-nodetree
sp-pr_method==PR_NODE_RENDER)
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23692] trunk/blender/source/blender/ editors/transform: Transform Mirror:
Revision: 23692
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23692
Author: blendix
Date: 2009-10-07 18:10:06 +0200 (Wed, 07 Oct 2009)
Log Message:
---
Transform Mirror:
* Make Ctrl+M key work for mirror in 3D view.
* Fix mirror along global axis, was mirroring around all axes when
the object was rotated, due to wrong matrix order, was also not
working in 2.4.
* Pressing e.g. X twice still doesn't go to local mode, would fix
but don't know how the code is intended to work.
Modified Paths:
--
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_ops.c
Modified: trunk/blender/source/blender/editors/transform/transform.c
===
--- trunk/blender/source/blender/editors/transform/transform.c 2009-10-07
15:16:08 UTC (rev 23691)
+++ trunk/blender/source/blender/editors/transform/transform.c 2009-10-07
16:10:06 UTC (rev 23692)
@@ -2334,7 +2334,7 @@
if (t-flag (T_OBJECT|T_TEXTURE|T_POSE)) {
float obsizemat[3][3];
// Reorient the size mat to fit the oriented object.
- Mat3MulMat3(obsizemat, tmat, td-axismtx);
+ Mat3MulMat3(obsizemat, td-axismtx, tmat);
//printmatrix3(obsizemat, obsizemat);
TransMat3ToSize(obsizemat, td-axismtx, fsize);
//printvecf(fsize, fsize);
Modified: trunk/blender/source/blender/editors/transform/transform_ops.c
===
--- trunk/blender/source/blender/editors/transform/transform_ops.c
2009-10-07 15:16:08 UTC (rev 23691)
+++ trunk/blender/source/blender/editors/transform/transform_ops.c
2009-10-07 16:10:06 UTC (rev 23692)
@@ -767,6 +767,8 @@
km = WM_keymap_add_item(keymap,
TFM_OT_create_orientation, SPACEKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
RNA_boolean_set(km-ptr, use, 1);
+ km = WM_keymap_add_item(keymap, TFM_OT_mirror, MKEY,
KM_PRESS, KM_CTRL, 0);
+
break;
case SPACE_ACTION:
km= WM_keymap_add_item(keymap, TFM_OT_transform,
GKEY, KM_PRESS, 0, 0);
@@ -837,7 +839,7 @@
km = WM_keymap_add_item(keymap, TFM_OT_resize, SKEY,
KM_PRESS, 0, 0);
- km = WM_keymap_add_item(keymap, TFM_OT_mirror, MKEY,
KM_PRESS, 0, 0);
+ km = WM_keymap_add_item(keymap, TFM_OT_mirror, MKEY,
KM_PRESS, KM_CTRL, 0);
break;
default:
break;
___
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 [23698] trunk/blender/source/blender/ windowmanager: WM: test with context-less add notifier.
Revision: 23698
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23698
Author: blendix
Date: 2009-10-07 23:39:24 +0200 (Wed, 07 Oct 2009)
Log Message:
---
WM: test with context-less add notifier. Notifiers are one
of the main reasons for passing along context, while actually
they don't need much context at all. Might be removed again,
but would like to have this especially for RNA API functions.
Modified Paths:
--
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/windowmanager/WM_api.h
===
--- trunk/blender/source/blender/windowmanager/WM_api.h 2009-10-07 21:19:58 UTC
(rev 23697)
+++ trunk/blender/source/blender/windowmanager/WM_api.h 2009-10-07 21:39:24 UTC
(rev 23698)
@@ -126,7 +126,8 @@
void WM_event_add_mousemove(struct bContext *C);
intWM_modal_tweak_exit(struct wmEvent *evt, int
tweak_event);
-void WM_event_add_notifier(const struct bContext *C, unsigned int
type, void *data);
+void WM_event_add_notifier(const struct bContext *C, unsigned int
type, void *reference);
+void WM_main_add_notifier(unsigned int type, void *reference);
void wm_event_add(struct wmWindow *win, struct wmEvent
*event_to_add); /* XXX only for warning */
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-10-07 21:19:58 UTC (rev 23697)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-10-07 21:39:24 UTC (rev 23698)
@@ -45,6 +45,7 @@
#include BKE_context.h
#include BKE_idprop.h
#include BKE_global.h
+#include BKE_main.h
#include BKE_object.h
#include BKE_report.h
#include BKE_scene.h
@@ -118,6 +119,26 @@
note-reference= reference;
}
+void WM_main_add_notifier(unsigned int type, void *reference)
+{
+ Main *bmain= G.main;
+ wmWindowManager *wm= bmain-wm.first;
+
+ if(wm) {
+ wmNotifier *note= MEM_callocN(sizeof(wmNotifier), notifier);
+
+ note-wm= wm;
+ BLI_addtail(note-wm-queue, note);
+
+ note-category= type NOTE_CATEGORY;
+ note-data= type NOTE_DATA;
+ note-subtype= type NOTE_SUBTYPE;
+ note-action= type NOTE_ACTION;
+
+ note-reference= reference;
+ }
+}
+
static wmNotifier *wm_notifier_next(wmWindowManager *wm)
{
wmNotifier *note= wm-queue.first;
___
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 [23723] trunk/blender: Key Configuration
Revision: 23723 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23723 Author: blendix Date: 2009-10-08 20:40:03 +0200 (Thu, 08 Oct 2009) Log Message: --- Key Configuration Keymaps are now saveable and configurable from the user preferences, note that editing one item in a keymap means the whole keymap is now defined by the user and will not be updated by Blender, an option for syncing might be added later. The outliner interface is still there, but I will probably remove it. There's actually 3 levels now: * Default builtin key configuration. * Key configuration loaded from .py file, for configs like Blender 2.4x or other 3D applications. * Keymaps edited by the user and saved in .B.blend. These can be saved to .py files as well to make creating distributable configurations easier. Also, user preferences sections were reorganized a bit, now there is: Interface, Editing, Input, Files and System. Implementation notes: * wmKeyConfig was added which represents a key configuration containing keymaps. * wmKeymapItem was renamed to wmKeyMapItem for consistency with wmKeyMap. * Modal maps are not wrapped yet. * User preferences DNA file reading did not support newdataadr() yet, added this now for reading keymaps. * Key configuration related settings are now RNA wrapped. * is_property_set and is_property_hidden python methods were added. Modified Paths: -- trunk/blender/release/scripts/ui/space_userpref.py trunk/blender/source/blender/blenkernel/BKE_screen.h trunk/blender/source/blender/blenkernel/intern/blender.c trunk/blender/source/blender/blenloader/intern/readfile.c trunk/blender/source/blender/blenloader/intern/writefile.c trunk/blender/source/blender/editors/animation/anim_channels_edit.c trunk/blender/source/blender/editors/animation/anim_markers.c trunk/blender/source/blender/editors/animation/anim_ops.c trunk/blender/source/blender/editors/armature/armature_ops.c trunk/blender/source/blender/editors/curve/curve_ops.c trunk/blender/source/blender/editors/gpencil/gpencil_ops.c trunk/blender/source/blender/editors/include/ED_anim_api.h trunk/blender/source/blender/editors/include/ED_armature.h trunk/blender/source/blender/editors/include/ED_curve.h trunk/blender/source/blender/editors/include/ED_gpencil.h trunk/blender/source/blender/editors/include/ED_markers.h trunk/blender/source/blender/editors/include/ED_mball.h trunk/blender/source/blender/editors/include/ED_mesh.h trunk/blender/source/blender/editors/include/ED_object.h trunk/blender/source/blender/editors/include/ED_particle.h trunk/blender/source/blender/editors/include/ED_physics.h trunk/blender/source/blender/editors/include/ED_screen.h trunk/blender/source/blender/editors/include/ED_sculpt.h trunk/blender/source/blender/editors/include/ED_transform.h trunk/blender/source/blender/editors/include/ED_uvedit.h trunk/blender/source/blender/editors/include/UI_interface.h trunk/blender/source/blender/editors/include/UI_view2d.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/interface/interface_utils.c trunk/blender/source/blender/editors/interface/view2d_ops.c trunk/blender/source/blender/editors/mesh/editmesh_mods.c trunk/blender/source/blender/editors/mesh/mesh_ops.c trunk/blender/source/blender/editors/metaball/mball_ops.c trunk/blender/source/blender/editors/object/object_ops.c trunk/blender/source/blender/editors/physics/physics_ops.c trunk/blender/source/blender/editors/screen/area.c trunk/blender/source/blender/editors/screen/screen_ops.c trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c trunk/blender/source/blender/editors/space_action/action_intern.h trunk/blender/source/blender/editors/space_action/action_ops.c trunk/blender/source/blender/editors/space_action/space_action.c trunk/blender/source/blender/editors/space_api/spacetypes.c trunk/blender/source/blender/editors/space_buttons/space_buttons.c trunk/blender/source/blender/editors/space_console/space_console.c trunk/blender/source/blender/editors/space_file/file_panels.c trunk/blender/source/blender/editors/space_file/filelist.c trunk/blender/source/blender/editors/space_file/filesel.c trunk/blender/source/blender/editors/space_file/space_file.c trunk/blender/source/blender/editors/space_graph/graph_intern.h trunk/blender/source/blender/editors/space_graph/graph_ops.c trunk/blender/source/blender/editors/space_graph/space_graph.c trunk/blender/source/blender/editors/space_image/space_image.c trunk/blender/source/blender/editors/space_info/space_info.c
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23730] trunk/blender: Fix some issues with showing the current textures when using
Revision: 23730
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23730
Author: blendix
Date: 2009-10-09 11:50:49 +0200 (Fri, 09 Oct 2009)
Log Message:
---
Fix some issues with showing the current textures when using
material nodes and texture nodes. Made it all use the same
give_current_*_texture functions now.
Modified Paths:
--
trunk/blender/release/scripts/ui/buttons_texture.py
trunk/blender/source/blender/blenkernel/BKE_texture.h
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/editors/space_buttons/buttons_context.c
trunk/blender/source/blender/editors/space_node/node_edit.c
Modified: trunk/blender/release/scripts/ui/buttons_texture.py
===
--- trunk/blender/release/scripts/ui/buttons_texture.py 2009-10-09 09:48:04 UTC
(rev 23729)
+++ trunk/blender/release/scripts/ui/buttons_texture.py 2009-10-09 09:50:49 UTC
(rev 23730)
@@ -75,12 +75,14 @@
layout.itemR(tex, use_nodes)
split = layout.split(percentage=0.2)
-
+
if tex.use_nodes:
slot = context.texture_slot
- split.itemL(text=Output:)
- split.itemR(slot, output_node, text=)
+ if slot:
+ split.itemL(text=Output:)
+ split.itemR(slot, output_node,
text=)
+
else:
split.itemL(text=Type:)
split.itemR(tex, type, text=)
Modified: trunk/blender/source/blender/blenkernel/BKE_texture.h
===
--- trunk/blender/source/blender/blenkernel/BKE_texture.h 2009-10-09
09:48:04 UTC (rev 23729)
+++ trunk/blender/source/blender/blenkernel/BKE_texture.h 2009-10-09
09:50:49 UTC (rev 23730)
@@ -31,17 +31,20 @@
#ifndef BKE_TEXTURE_H
#define BKE_TEXTURE_H
-struct Scene;
-struct Tex;
+struct Brush;
+struct ColorBand;
+struct EnvMap;
+struct HaloRen;
+struct Lamp;
+struct LampRen;
+struct Material;
struct MTex;
struct PluginTex;
-struct LampRen;
-struct ColorBand;
-struct HaloRen;
+struct PointDensity;
+struct Tex;
struct TexMapping;
-struct EnvMap;
-struct PointDensity;
struct VoxelData;
+struct World;
/* in ColorBand struct */
#define MAXCOLORBAND 32
@@ -65,9 +68,13 @@
struct Tex *copy_texture(struct Tex *tex);
void make_local_texture(struct Tex *tex);
void autotexname(struct Tex *tex);
-struct Tex *give_current_texture(struct Object *ob, int act);
-struct Tex *give_current_world_texture(struct Scene *scene);
+struct Tex *give_current_object_texture(struct Object *ob);
+struct Tex *give_current_material_texture(struct Material *ma);
+struct Tex *give_current_lamp_texture(struct Lamp *la);
+struct Tex *give_current_world_texture(struct World *world);
+struct Tex *give_current_brush_texture(struct Brush *br);
+
struct TexMapping *add_mapping(void);
void init_mapping(struct TexMapping *texmap);
Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===
--- trunk/blender/source/blender/blenkernel/intern/texture.c2009-10-09
09:48:04 UTC (rev 23729)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c2009-10-09
09:50:49 UTC (rev 23730)
@@ -809,72 +809,90 @@
/* - */
-Tex *give_current_texture(Object *ob, int act)
+Tex *give_current_object_texture(Object *ob)
{
- Material ***matarar, *ma;
- Lamp *la = 0;
- MTex *mtex = 0;
- Tex *tex = 0;
- bNode *node;
+ Material *ma;
+ Tex *tex= NULL;
if(ob==0) return 0;
if(ob-totcol==0 !(ob-type==OB_LAMP)) return 0;
if(ob-type==OB_LAMP) {
- la=(Lamp *)ob-data;
- if(la) {
- mtex= la-mtex[(int)(la-texact)];
- if(mtex) tex= mtex-tex;
- }
+ tex= give_current_lamp_texture(ob-data);
} else {
- if(actob-totcol) act= ob-totcol;
- else if(act==0) act= 1;
-
- if(ob-matbits[act-1]) {/* in object */
- ma= ob-mat[act-1];
- }
- else {
/* in data */
- matarar= give_matarar(ob);
-
- if(matarar *matarar) ma= (*matarar)[act-1];
- else ma= 0;
- }
+ ma= give_current_material(ob, ob-actcol);
+ tex=
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23731] trunk/blender/source/blender/ editors: 3D View panels now show object and bone name again, not sure it
Revision: 23731
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23731
Author: blendix
Date: 2009-10-09 12:45:11 +0200 (Fri, 09 Oct 2009)
Log Message:
---
3D View panels now show object and bone name again, not sure it
belongs here still, but this came up often, it avoids having to
switch tabs a lot when creating things.
Also renamed uiLayoutFreeBlock to uiLayoutAbsoluteBlock.
Modified Paths:
--
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/interface_templates.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_node/drawnode.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===
--- trunk/blender/source/blender/editors/include/UI_interface.h 2009-10-09
09:50:49 UTC (rev 23730)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2009-10-09
10:45:11 UTC (rev 23731)
@@ -614,7 +614,7 @@
uiLayout *uiLayoutFree(uiLayout *layout, int align);
uiLayout *uiLayoutSplit(uiLayout *layout, float percentage);
-uiBlock *uiLayoutFreeBlock(uiLayout *layout);
+uiBlock *uiLayoutAbsoluteBlock(uiLayout *layout);
/* templates */
void uiTemplateHeader(uiLayout *layout, struct bContext *C, int menus);
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===
--- trunk/blender/source/blender/editors/interface/interface_layout.c
2009-10-09 09:50:49 UTC (rev 23730)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c
2009-10-09 10:45:11 UTC (rev 23731)
@@ -96,7 +96,7 @@
ITEM_LAYOUT_COLUMN_FLOW,
ITEM_LAYOUT_ROW_FLOW,
ITEM_LAYOUT_BOX,
- ITEM_LAYOUT_FREE,
+ ITEM_LAYOUT_ABSOLUTE,
ITEM_LAYOUT_SPLIT,
ITEM_LAYOUT_ROOT
@@ -290,7 +290,7 @@
case ITEM_LAYOUT_COLUMN:
case ITEM_LAYOUT_COLUMN_FLOW:
case ITEM_LAYOUT_SPLIT:
- case ITEM_LAYOUT_FREE:
+ case ITEM_LAYOUT_ABSOLUTE:
case ITEM_LAYOUT_BOX:
default:
return UI_LAYOUT_VERTICAL;
@@ -1731,7 +1731,7 @@
}
/* free layout */
-static void ui_litem_estimate_free(uiLayout *litem)
+static void ui_litem_estimate_absolute(uiLayout *litem)
{
uiItem *item;
int itemx, itemy, itemw, itemh, minx, miny;
@@ -1756,7 +1756,7 @@
litem-h -= miny;
}
-static void ui_litem_layout_free(uiLayout *litem)
+static void ui_litem_layout_absolute(uiLayout *litem)
{
uiItem *item;
float scalex=1.0f, scaley=1.0f;
@@ -1962,7 +1962,7 @@
uiLayout *litem;
litem= MEM_callocN(sizeof(uiLayout), uiLayoutFree);
- litem-item.type= ITEM_LAYOUT_FREE;
+ litem-item.type= ITEM_LAYOUT_ABSOLUTE;
litem-root= layout-root;
litem-align= align;
litem-active= 1;
@@ -1975,7 +1975,7 @@
return litem;
}
-uiBlock *uiLayoutFreeBlock(uiLayout *layout)
+uiBlock *uiLayoutAbsoluteBlock(uiLayout *layout)
{
uiBlock *block;
@@ -2136,8 +2136,8 @@
case ITEM_LAYOUT_ROOT:
ui_litem_estimate_root(litem);
break;
- case ITEM_LAYOUT_FREE:
- ui_litem_estimate_free(litem);
+ case ITEM_LAYOUT_ABSOLUTE:
+ ui_litem_estimate_absolute(litem);
break;
case ITEM_LAYOUT_SPLIT:
ui_litem_estimate_split(litem);
@@ -2161,7 +2161,7 @@
if(!bitem-but-alignnr)
bitem-but-alignnr= nr;
}
- else if(item-type == ITEM_LAYOUT_FREE);
+ else if(item-type == ITEM_LAYOUT_ABSOLUTE);
else if(item-type == ITEM_LAYOUT_BOX) {
box= (uiLayoutItemBx*)item;
box-roundbox-alignnr= nr;
@@ -2221,8 +2221,8 @@
case ITEM_LAYOUT_ROOT:
ui_litem_layout_root(litem);
break;
- case ITEM_LAYOUT_FREE:
- ui_litem_layout_free(litem);
+ case ITEM_LAYOUT_ABSOLUTE:
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23738] trunk/blender/source/blender: Particle Edit Mode:
Revision: 23738
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23738
Author: blendix
Date: 2009-10-09 15:25:54 +0200 (Fri, 09 Oct 2009)
Log Message:
---
Particle Edit Mode:
* Fix crash trying to enter particle mode when the particle modifier
is disabled in the stack.
* Fix redraw being very slow due to the draw function causing the
object to be recalculated on each redraw (through PE_draw_object).
* Removed the system where PE_get_current would automatically create
the particle edit, this would run from poll() functions, which gave
all kinds of issues, now it only creates the data on enter/exit
and switching active particle system.
Modified Paths:
--
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/include/ED_particle.h
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2009-10-09
12:48:28 UTC (rev 23737)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-10-09
13:25:54 UTC (rev 23738)
@@ -3918,7 +3918,7 @@
ob-flag = ~OB_FROMGROUP;
/* editmode doesn't get saved in files, so should get cleared when
reloading... */
- ob-mode = ~OB_MODE_EDIT;
+ ob-mode = ~(OB_MODE_EDIT|OB_MODE_PARTICLE_EDIT);
ob-disp.first=ob-disp.last= NULL;
Modified: trunk/blender/source/blender/editors/include/ED_particle.h
===
--- trunk/blender/source/blender/editors/include/ED_particle.h 2009-10-09
12:48:28 UTC (rev 23737)
+++ trunk/blender/source/blender/editors/include/ED_particle.h 2009-10-09
13:25:54 UTC (rev 23738)
@@ -46,6 +46,8 @@
/* access */
struct PTCacheEdit *PE_get_current(struct Scene *scene, struct Object *ob);
+struct PTCacheEdit *PE_create_current(struct Scene *scene, struct Object *ob);
+void PE_current_changed(struct Scene *scene, struct Object *ob);
int PE_minmax(struct Scene *scene, float *min, float *max);
struct ParticleEditSettings *PE_settings(struct Scene *scene);
Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===
--- trunk/blender/source/blender/editors/physics/particle_edit.c
2009-10-09 12:48:28 UTC (rev 23737)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c
2009-10-09 13:25:54 UTC (rev 23738)
@@ -194,7 +194,7 @@
}
/* always gets atleast the first particlesystem even if PSYS_CURRENT flag is
not set */
-PTCacheEdit *PE_get_current(Scene *scene, Object *ob)
+static PTCacheEdit *pe_get_current(Scene *scene, Object *ob, int create)
{
ParticleEditSettings *pset= PE_settings(scene);
PTCacheEdit *edit = NULL;
@@ -232,18 +232,18 @@
if(psys-flag PSYS_CURRENT) {
if(psys-part psys-part-type == PART_HAIR)
{
if(psys-flag PSYS_HAIR_DYNAMICS
psys-pointcache-flag PTCACHE_BAKED) {
- if(!psys-pointcache-edit)
+ if(create
!psys-pointcache-edit)
PE_create_particle_edit(scene, ob, pid-cache, NULL);
edit = pid-cache-edit;
}
else {
- if(!psys-edit psys-flag
PSYS_HAIR_DONE)
+ if(create !psys-edit
psys-flag PSYS_HAIR_DONE)
PE_create_particle_edit(scene, ob, NULL, psys);
edit = psys-edit;
}
}
else {
- if(pid-cache-flag PTCACHE_BAKED
!pid-cache-edit)
+ if(create pid-cache-flag
PTCACHE_BAKED !pid-cache-edit)
PE_create_particle_edit(scene,
ob, pid-cache, psys);
edit = pid-cache-edit;
}
@@ -252,13 +252,13 @@
}
}
else if(pset-edittype == PE_TYPE_SOFTBODY pid-type ==
PTCACHE_TYPE_SOFTBODY) {
- if(pid-cache-flag PTCACHE_BAKED
!pid-cache-edit)
+ if(create pid-cache-flag PTCACHE_BAKED
!pid-cache-edit)
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23743] trunk/blender/source/blender/ editors/space_image/image_ops.c: Fix for crash when saving a render result image, then rendering
Revision: 23743
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23743
Author: blendix
Date: 2009-10-09 17:09:21 +0200 (Fri, 09 Oct 2009)
Log Message:
---
Fix for crash when saving a render result image, then rendering
again. The saved image would still point to the render buffer,
which was freed again on render. This is not a real solution but
avoids the crash for now.
Modified Paths:
--
trunk/blender/source/blender/editors/space_image/image_ops.c
Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===
--- trunk/blender/source/blender/editors/space_image/image_ops.c
2009-10-09 14:42:36 UTC (rev 23742)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c
2009-10-09 15:09:21 UTC (rev 23743)
@@ -813,12 +813,25 @@
ibuf-userflags = ~IB_BITMAPDIRTY;
/* change type? */
+ if(ima-type==IMA_TYPE_R_RESULT) {
+ ima-type= IMA_TYPE_IMAGE;
+
+ /* workaround to ensure the render result
buffer is no longer used
+* by this image, otherwise can crash when a
new render result is
+* created. */
+ if(ibuf-rect !(ibuf-mall IB_rect))
+ imb_freerectImBuf(ibuf);
+ if(ibuf-rect_float !(ibuf-mall
IB_rectfloat))
+ imb_freerectfloatImBuf(ibuf);
+ if(ibuf-zbuf !(ibuf-mall IB_zbuf))
+ IMB_freezbufImBuf(ibuf);
+ if(ibuf-zbuf_float !(ibuf-mall
IB_zbuffloat))
+ IMB_freezbuffloatImBuf(ibuf);
+ }
if( ELEM(ima-source, IMA_SRC_GENERATED,
IMA_SRC_VIEWER)) {
ima-source= IMA_SRC_FILE;
ima-type= IMA_TYPE_IMAGE;
}
- if(ima-type==IMA_TYPE_R_RESULT)
- ima-type= IMA_TYPE_IMAGE;
/* name image as how we saved it */
len= strlen(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 [23748] trunk/blender/source/blender/ render/intern/source/texture.c: Bugfix: texture nodes render without OSA was using uninitialized
Revision: 23748
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23748
Author: blendix
Date: 2009-10-09 22:59:44 +0200 (Fri, 09 Oct 2009)
Log Message:
---
Bugfix: texture nodes render without OSA was using uninitialized
variables, giving incorrect results.
Modified Paths:
--
trunk/blender/source/blender/render/intern/source/texture.c
Modified: trunk/blender/source/blender/render/intern/source/texture.c
===
--- trunk/blender/source/blender/render/intern/source/texture.c 2009-10-09
20:44:50 UTC (rev 23747)
+++ trunk/blender/source/blender/render/intern/source/texture.c 2009-10-09
20:59:44 UTC (rev 23748)
@@ -1182,7 +1182,8 @@
texres-talpha= 0; /* is set when image texture returns alpha
(considered premul) */
if(tex-use_nodes tex-nodetree) {
- retval = evalnodes(tex, texvec, dxt, dyt, texres, thread,
which_output);
+ if(osatex) retval = evalnodes(tex, texvec, dxt, dyt, texres,
thread, which_output);
+ else retval = evalnodes(tex, texvec, NULL, NULL, texres,
thread, which_output);
}
else
switch(tex-type) {
___
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 [23749] trunk/blender/source/blender/ editors/mesh/editmesh.c: Bugfix: separate mesh did not preserve UV/ Color layers.
Revision: 23749 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23749 Author: blendix Date: 2009-10-09 23:45:14 +0200 (Fri, 09 Oct 2009) Log Message: --- Bugfix: separate mesh did not preserve UV/Color layers. Modified Paths: -- trunk/blender/source/blender/editors/mesh/editmesh.c Modified: trunk/blender/source/blender/editors/mesh/editmesh.c === --- trunk/blender/source/blender/editors/mesh/editmesh.c2009-10-09 20:59:44 UTC (rev 23748) +++ trunk/blender/source/blender/editors/mesh/editmesh.c2009-10-09 21:45:14 UTC (rev 23749) @@ -1342,11 +1342,14 @@ ED_base_object_select(basenew, BA_DESELECT); /* 2 */ - basenew-object-data= menew= add_mesh(me-id.name);/* empty */ + basenew-object-data= menew= add_mesh(me-id.name+2); /* empty */ assign_matarar(basenew-object, give_matarar(obedit), *give_totcolp(obedit)); /* new in 2.5 */ me-id.us--; make_editMesh(scene, basenew-object); emnew= menew-edit_mesh; + CustomData_copy(em-vdata, emnew-vdata, CD_MASK_EDITMESH, CD_DEFAULT, 0); + CustomData_copy(em-edata, emnew-edata, CD_MASK_EDITMESH, CD_DEFAULT, 0); + CustomData_copy(em-fdata, emnew-fdata, CD_MASK_EDITMESH, CD_DEFAULT, 0); /* 3 */ /* SPLIT: first make duplicate */ @@ -1389,6 +1392,8 @@ /* 5 */ load_editMesh(scene, basenew-object); free_editMesh(emnew); + MEM_freeN(menew-edit_mesh); + menew-edit_mesh= NULL; /* hashedges are invalid now, make new! */ editMesh_set_hash(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 [23750] trunk/blender/source/blender/ editors/screen/screen_ops.c: Animation playback can now also be cancelled with ESC key.
Revision: 23750
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23750
Author: blendix
Date: 2009-10-09 23:50:33 +0200 (Fri, 09 Oct 2009)
Log Message:
---
Animation playback can now also be cancelled with ESC key.
Modified Paths:
--
trunk/blender/source/blender/editors/screen/screen_ops.c
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===
--- trunk/blender/source/blender/editors/screen/screen_ops.c2009-10-09
21:45:14 UTC (rev 23749)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c2009-10-09
21:50:33 UTC (rev 23750)
@@ -2384,6 +2384,29 @@
RNA_def_boolean(ot-srna, sync, 0, Sync, Drop frames to maintain
framerate and stay in sync with audio.);
}
+static int screen_animation_cancel(bContext *C, wmOperator *op, wmEvent *event)
+{
+ bScreen *screen= CTX_wm_screen(C);
+
+ if(screen-animtimer)
+ return screen_animation_play(C, op, event);
+
+ return OPERATOR_PASS_THROUGH;
+}
+
+static void SCREEN_OT_animation_cancel(wmOperatorType *ot)
+{
+ /* identifiers */
+ ot-name= Cancel Animation;
+ ot-description= Cancel animation.;
+ ot-idname= SCREEN_OT_animation_cancel;
+
+ /* api callbacks */
+ ot-invoke= screen_animation_cancel;
+
+ ot-poll= ED_operator_screenactive;
+}
+
/* ** border select operator (template)
* */
/* operator state vars used: (added by default WM callbacks)
@@ -2994,6 +3017,7 @@
/* test if we have a temp screen in front */
if(CTX_wm_window(C)-screen-full==SCREENTEMP) {
wm_window_lower(CTX_wm_window(C));
+ return OPERATOR_FINISHED;
}
/* determine if render already shows */
else if(sima-flag SI_PREVSPACE) {
@@ -3005,13 +3029,16 @@
}
else
ED_area_prevspace(C);
+
+ return OPERATOR_FINISHED;
}
else if(sima-flag SI_FULLWINDOW) {
sima-flag = ~SI_FULLWINDOW;
ed_screen_fullarea(C, sa);
- }
-
- return OPERATOR_FINISHED;
+ return OPERATOR_FINISHED;
+ }
+
+ return OPERATOR_PASS_THROUGH;
}
static void SCREEN_OT_render_view_cancel(struct wmOperatorType *ot)
@@ -3268,6 +3295,7 @@
WM_operatortype_append(SCREEN_OT_animation_step);
WM_operatortype_append(SCREEN_OT_animation_play);
+ WM_operatortype_append(SCREEN_OT_animation_cancel);
/* render */
WM_operatortype_append(SCREEN_OT_render);
@@ -3408,6 +3436,7 @@
WM_keymap_add_item(keymap, SCREEN_OT_animation_play, AKEY, KM_PRESS,
KM_ALT, 0);
WM_keymap_add_item(keymap, SCREEN_OT_animation_play, KKEY, KM_PRESS,
0, LKEY);
RNA_boolean_set(WM_keymap_add_item(keymap, SCREEN_OT_animation_play,
AKEY, KM_PRESS, KM_ALT|KM_SHIFT, 0)-ptr, reverse, 1);
+ WM_keymap_add_item(keymap, SCREEN_OT_animation_cancel, ESCKEY,
KM_PRESS, 0, 0);
keymap_modal_set(keyconf);
}
___
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 [23751] trunk/blender/source/blender/ editors/space_image: Add reload button for image textures.
Revision: 23751
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23751
Author: blendix
Date: 2009-10-10 00:00:33 +0200 (Sat, 10 Oct 2009)
Log Message:
---
Add reload button for image textures.
Modified Paths:
--
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_image/image_ops.c
Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===
--- trunk/blender/source/blender/editors/space_image/image_buttons.c
2009-10-09 21:50:33 UTC (rev 23750)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c
2009-10-09 22:00:33 UTC (rev 23751)
@@ -943,6 +943,8 @@
cb-prop= prop;
cb-iuser= iuser;
+ uiLayoutSetContextPointer(layout, edit_image, imaptr);
+
if(!compact)
uiTemplateID(layout, C, ptr, propname, IMAGE_OT_new,
IMAGE_OT_open, NULL);
@@ -992,9 +994,9 @@
uiItemR(row, NULL, 0, imaptr, source, (compact)? 0:
UI_ITEM_R_EXPAND);
if(ima-source != IMA_SRC_GENERATED) {
- row= uiLayoutRow(layout, 0);
+ row= uiLayoutRow(layout, 1);
uiItemR(row, , 0, imaptr, filename, 0);
- //uiItemO(row, Reload, 0, image.reload);
+ uiItemO(row, , ICON_FILE_REFRESH,
image.reload);
}
// XXX what was this for?
Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===
--- trunk/blender/source/blender/editors/space_image/image_ops.c
2009-10-09 21:50:33 UTC (rev 23750)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c
2009-10-09 22:00:33 UTC (rev 23751)
@@ -108,6 +108,11 @@
sima_zoom_set(sima, ar, sima-zoom*zoomfac);
}
+static int image_poll(bContext *C)
+{
+ return (CTX_data_edit_image(C) != NULL);
+}
+
static int space_image_poll(bContext *C)
{
SpaceImage *sima= CTX_wm_space_image(C);
@@ -1070,19 +1075,16 @@
static int reload_exec(bContext *C, wmOperator *op)
{
- SpaceImage *sima;
+ Image *ima= CTX_data_edit_image(C);
+ SpaceImage *sima= CTX_wm_space_image(C);
- /* retrieve state */
- sima= CTX_wm_space_image(C);
-
- if(!sima-image)
+ if(!ima)
return OPERATOR_CANCELLED;
- BKE_image_signal(sima-image, sima-iuser, IMA_SIGNAL_RELOAD);
- /* ED_space_image_set(C, sima, scene, obedit, NULL); - do we really
need this? */
+ // XXX other users?
+ BKE_image_signal(ima, (sima)? sima-iuser: NULL, IMA_SIGNAL_RELOAD);
- // XXX BIF_preview_changed(ID_TE);
- WM_event_add_notifier(C, NC_IMAGE|NA_EDITED, sima-image);
+ WM_event_add_notifier(C, NC_IMAGE|NA_EDITED, ima);
ED_area_tag_redraw(CTX_wm_area(C));
return OPERATOR_FINISHED;
@@ -1096,7 +1098,7 @@
/* api callbacks */
ot-exec= reload_exec;
- ot-poll= space_image_poll;
+ ot-poll= image_poll;
/* flags */
ot-flag= OPTYPE_REGISTER|OPTYPE_UNDO;
___
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 [23784] trunk/blender/source/blender: Bugfix: texture nodes header was still showing wrong texture
Revision: 23784
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23784
Author: blendix
Date: 2009-10-12 15:12:45 +0200 (Mon, 12 Oct 2009)
Log Message:
---
Bugfix: texture nodes header was still showing wrong texture
when using node materials.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_texture.h
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/makesrna/intern/rna_brush.c
trunk/blender/source/blender/makesrna/intern/rna_lamp.c
trunk/blender/source/blender/makesrna/intern/rna_material.c
trunk/blender/source/blender/makesrna/intern/rna_world.c
Modified: trunk/blender/source/blender/blenkernel/BKE_texture.h
===
--- trunk/blender/source/blender/blenkernel/BKE_texture.h 2009-10-12
12:54:08 UTC (rev 23783)
+++ trunk/blender/source/blender/blenkernel/BKE_texture.h 2009-10-12
13:12:45 UTC (rev 23784)
@@ -75,6 +75,11 @@
struct Tex *give_current_world_texture(struct World *world);
struct Tex *give_current_brush_texture(struct Brush *br);
+void set_current_brush_texture(struct Brush *br, struct Tex *tex);
+void set_current_world_texture(struct World *wo, struct Tex *tex);
+void set_current_material_texture(struct Material *ma, struct Tex *tex);
+void set_current_lamp_texture(struct Lamp *la, struct Tex *tex);
+
struct TexMapping *add_mapping(void);
void init_mapping(struct TexMapping *texmap);
Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===
--- trunk/blender/source/blender/blenkernel/intern/texture.c2009-10-12
12:54:08 UTC (rev 23783)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c2009-10-12
13:12:45 UTC (rev 23784)
@@ -840,6 +840,28 @@
return tex;
}
+void set_current_lamp_texture(Lamp *la, Tex *newtex)
+{
+ int act= la-texact;
+
+ if(la-mtex[act] la-mtex[act]-tex)
+ id_us_min(la-mtex[act]-tex-id);
+
+ if(newtex) {
+ if(!la-mtex[act]) {
+ la-mtex[act]= add_mtex();
+ la-mtex[act]-texco= TEXCO_GLOB;
+ }
+
+ la-mtex[act]-tex= newtex;
+ id_us_plus(newtex-id);
+ }
+ else if(la-mtex[act]) {
+ MEM_freeN(la-mtex[act]);
+ la-mtex[act]= NULL;
+ }
+}
+
Tex *give_current_material_texture(Material *ma)
{
MTex *mtex= NULL;
@@ -867,6 +889,47 @@
return tex;
}
+void set_current_material_texture(Material *ma, Tex *newtex)
+{
+ Tex *tex= NULL;
+ bNode *node;
+
+ if(ma ma-use_nodes ma-nodetree) {
+ node= nodeGetActiveID(ma-nodetree, ID_TE);
+
+ if(node) {
+ tex= (Tex *)node-id;
+ id_us_min(tex-id);
+ node-id= newtex-id;
+ id_us_plus(newtex-id);
+ ma= NULL;
+ }
+ else {
+ node= nodeGetActiveID(ma-nodetree, ID_MA);
+ if(node)
+ ma= (Material*)node-id;
+ }
+ }
+ if(ma) {
+ int act= (int)ma-texact;
+
+ tex= (ma-mtex[act])? ma-mtex[act]-tex: NULL;
+ id_us_min(tex-id);
+
+ if(newtex) {
+ if(!ma-mtex[act])
+ ma-mtex[act]= add_mtex();
+
+ ma-mtex[act]-tex= newtex;
+ id_us_plus(newtex-id);
+ }
+ else if(ma-mtex[act]) {
+ MEM_freeN(ma-mtex[act]);
+ ma-mtex[act]= NULL;
+ }
+ }
+}
+
Tex *give_current_world_texture(World *world)
{
MTex *mtex= NULL;
@@ -880,6 +943,28 @@
return tex;
}
+void set_current_world_texture(World *wo, Tex *newtex)
+{
+ int act= wo-texact;
+
+ if(wo-mtex[act] wo-mtex[act]-tex)
+ id_us_min(wo-mtex[act]-tex-id);
+
+ if(newtex) {
+ if(!wo-mtex[act]) {
+ wo-mtex[act]= add_mtex();
+ wo-mtex[act]-texco= TEXCO_VIEW;
+ }
+
+ wo-mtex[act]-tex= newtex;
+ id_us_plus(newtex-id);
+ }
+ else if(wo-mtex[act]) {
+ MEM_freeN(wo-mtex[act]);
+ wo-mtex[act]= NULL;
+ }
+}
+
Tex *give_current_brush_texture(Brush *br)
{
MTex *mtex= NULL;
@@ -893,6 +978,26 @@
return tex;
}
+void set_current_brush_texture(Brush *br, Tex *newtex)
+{
+ int act= br-texact;
+
+ if(br-mtex[act] br-mtex[act]-tex)
+ id_us_min(br-mtex[act]-tex-id);
+
+ if(newtex) {
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23792] trunk/blender/source/blender/ makesrna/intern/rna_lamp.c: Fix #19631: soft size setting for lamps was not RNA wrapped correct.
Revision: 23792 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23792 Author: blendix Date: 2009-10-12 21:19:29 +0200 (Mon, 12 Oct 2009) Log Message: --- Fix #19631: soft size setting for lamps was not RNA wrapped correct. Modified Paths: -- trunk/blender/source/blender/makesrna/intern/rna_lamp.c Modified: trunk/blender/source/blender/makesrna/intern/rna_lamp.c === --- trunk/blender/source/blender/makesrna/intern/rna_lamp.c 2009-10-12 17:16:44 UTC (rev 23791) +++ trunk/blender/source/blender/makesrna/intern/rna_lamp.c 2009-10-12 19:19:29 UTC (rev 23792) @@ -480,7 +480,7 @@ RNA_def_property_update(prop, 0, rna_Lamp_update); prop= RNA_def_property(srna, shadow_soft_size, PROP_FLOAT, PROP_DISTANCE); - RNA_def_property_float_sdna(prop, NULL, soft); + RNA_def_property_float_sdna(prop, NULL, area_size); RNA_def_property_ui_range(prop, 0, 100, 0.1, 3); RNA_def_property_ui_text(prop, Shadow Soft Size, Light size for ray shadow sampling (Raytraced shadows).); RNA_def_property_update(prop, 0, rna_Lamp_update); ___ 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 [23794] trunk/blender: Deep Shadow Buffer
Revision: 23794
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23794
Author: blendix
Date: 2009-10-12 21:41:40 +0200 (Mon, 12 Oct 2009)
Log Message:
---
Deep Shadow Buffer
Since the deep shadow buffer summer of code project is not actively under
development anymore, I decided to build my own DSM implementation from
scratch, based on reusing as much existing shadow buffer code as possible.
It's not very advanced, but implements the basic algorithm. Just enough so
we can do shading tests with it, optimizations and other improvements can
be done later.
Supported:
* Classical shadow buffer options: filter, soft, bias, ..
* Multiple sample buffers, merged into one.
* Halfway trick to support lower bias.
* Compression with user defined threshold.
* Non-textured alpha transparency, using Casting Alpha value.
* Strand render.
Not Supported:
* Tiling disk cache, so can use a lot of memory.
* Per part rendering for lower memory usage during creation.
* Colored shadow.
* Textured color/alpha shadow.
* Mipmaps for faster filtering.
* Volume shadows.
Usage Hints:
* Use sample buffers + smaller size rather than large size.
* For example 512 size x 9 sample buffers instead of 2048 x 1.
* Compression threshold 0.05 works, but is on the conservative side.
Modified Paths:
--
trunk/blender/release/scripts/ui/buttons_data_lamp.py
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/makesdna/DNA_lamp_types.h
trunk/blender/source/blender/makesrna/intern/rna_lamp.c
trunk/blender/source/blender/makesrna/intern/rna_material.c
trunk/blender/source/blender/render/intern/include/render_types.h
trunk/blender/source/blender/render/intern/include/zbuf.h
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/rendercore.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
trunk/blender/source/blender/render/intern/source/shadeinput.c
trunk/blender/source/blender/render/intern/source/strand.c
trunk/blender/source/blender/render/intern/source/zbuf.c
Modified: trunk/blender/release/scripts/ui/buttons_data_lamp.py
===
--- trunk/blender/release/scripts/ui/buttons_data_lamp.py 2009-10-12
19:34:58 UTC (rev 23793)
+++ trunk/blender/release/scripts/ui/buttons_data_lamp.py 2009-10-12
19:41:40 UTC (rev 23794)
@@ -202,7 +202,7 @@
col.itemL(text=Buffer Type:)
col.row().itemR(lamp, shadow_buffer_type, expand=True)
- if lamp.shadow_buffer_type in ('REGULAR', 'HALFWAY'):
+ if lamp.shadow_buffer_type in ('REGULAR', 'HALFWAY',
'DEEP'):
split = layout.split()
col = split.column()
@@ -218,6 +218,8 @@
sub = col.column(align=True)
sub.itemR(lamp, shadow_buffer_size,
text=Size)
sub.itemR(lamp, shadow_buffer_samples,
text=Samples)
+ if lamp.shadow_buffer_type == 'DEEP':
+ col.itemR(lamp, compression_threshold)
elif lamp.shadow_buffer_type == 'IRREGULAR':
layout.itemR(lamp, shadow_buffer_bias,
text=Bias)
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2009-10-12
19:34:58 UTC (rev 23793)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2009-10-12
19:41:40 UTC (rev 23794)
@@ -43,7 +43,7 @@
struct ReportList;
#define BLENDER_VERSION250
-#define BLENDER_SUBVERSION 5
+#define BLENDER_SUBVERSION 6
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===
--- trunk/blender/source/blender/blenkernel/intern/object.c 2009-10-12
19:34:58 UTC (rev 23793)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2009-10-12
19:41:40 UTC (rev 23794)
@@ -772,6 +772,7 @@
la-samp= 3;
la-bias= 1.0f;
la-soft= 3.0f;
+ la-compressthresh= 0.05f;
la-ray_samp= la-ray_sampy= la-ray_sampz= 1;
la-area_size=la-area_sizey=la-area_sizez= 1.0f;
la-buffers= 1;
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
Re: [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23794] trunk/blender: Deep Shadow Buffer
Hi, It seems I wasn't entirely clear about if I reused code or not, what I meant to say is that I did not use the soc project code, but rather decided on a different implementation that integrated closer into the old shadow buffer code. This was easier for me than to try to understand and debug the soc project code. The core of this DSM code is 500 lines of code, everything else is tweaks to fit it in. Most of the optimizations like disk caches and per part rendering could still reuse soc project code, and that kind of functionality is something that I intend to tackle more globally in the render engine later on, not just for DSM. Brecht. going this way would make it easier for me to debug and most of the optimizations On Mon, Oct 12, 2009 at 9:41 PM, Brecht Van Lommel bre...@blender.org wrote: Revision: 23794 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23794 Author: blendix Date: 2009-10-12 21:41:40 +0200 (Mon, 12 Oct 2009) Log Message: --- Deep Shadow Buffer Since the deep shadow buffer summer of code project is not actively under development anymore, I decided to build my own DSM implementation from scratch, based on reusing as much existing shadow buffer code as possible. It's not very advanced, but implements the basic algorithm. Just enough so we can do shading tests with it, optimizations and other improvements can be done later. ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
Re: [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23794] trunk/blender: Deep Shadow Buffer
Sorry, ignore that last line, didn't notice it was still there.. I noticed there seems to be a problem running this code on my Mac, shadows are not showing up, will investigate tomorrow. On Mon, Oct 12, 2009 at 10:50 PM, Brecht Van Lommel bre...@blender.org wrote: Hi, It seems I wasn't entirely clear about if I reused code or not, what I meant to say is that I did not use the soc project code, but rather decided on a different implementation that integrated closer into the old shadow buffer code. This was easier for me than to try to understand and debug the soc project code. The core of this DSM code is 500 lines of code, everything else is tweaks to fit it in. Most of the optimizations like disk caches and per part rendering could still reuse soc project code, and that kind of functionality is something that I intend to tackle more globally in the render engine later on, not just for DSM. Brecht. going this way would make it easier for me to debug and most of the optimizations On Mon, Oct 12, 2009 at 9:41 PM, Brecht Van Lommel bre...@blender.org wrote: Revision: 23794 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23794 Author: blendix Date: 2009-10-12 21:41:40 +0200 (Mon, 12 Oct 2009) Log Message: --- Deep Shadow Buffer Since the deep shadow buffer summer of code project is not actively under development anymore, I decided to build my own DSM implementation from scratch, based on reusing as much existing shadow buffer code as possible. It's not very advanced, but implements the basic algorithm. Just enough so we can do shading tests with it, optimizations and other improvements can be done later. ___ 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 [23813] trunk/blender/source/blender/ editors: Bugfixes for particle mode:
Revision: 23813
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23813
Author: blendix
Date: 2009-10-13 19:15:12 +0200 (Tue, 13 Oct 2009)
Log Message:
---
Bugfixes for particle mode:
* Fix crash removing all particles.
* Brush added particles did not get correct coordinates.
Modified Paths:
--
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===
--- trunk/blender/source/blender/editors/physics/particle_edit.c
2009-10-13 16:08:34 UTC (rev 23812)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c
2009-10-13 17:15:12 UTC (rev 23813)
@@ -3003,6 +3003,9 @@
for(k=0, hkey=pa-hair; kpa-totkey; k++, hkey++,
key++) {
key-co= hkey-co;
key-time= hkey-time;
+
+ if(!(psys-flag PSYS_GLOBAL_HAIR))
+ key-flag |= PEK_USE_WCO;
}
pa-size= 1.0f;
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c
2009-10-13 16:08:34 UTC (rev 23812)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c
2009-10-13 17:15:12 UTC (rev 23813)
@@ -4237,7 +4237,7 @@
if(!(point-flag PEP_HIDE))
totkeys += point-totkey;
- if(!(edit-points-keys-flag PEK_USE_WCO))
+ if(edit-points !(edit-points-keys-flag
PEK_USE_WCO))
pd=pdata=MEM_callocN(totkeys*3*sizeof(float),
particle edit point data);
cd=cdata=MEM_callocN(totkeys*(timed?4:3)*sizeof(float),
particle edit color 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 [23823] trunk/blender/source/blender/ editors/transform/transform_generics.c: Bugfix: uv editor transform operators were not working anymore
Revision: 23823
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23823
Author: blendix
Date: 2009-10-14 11:08:48 +0200 (Wed, 14 Oct 2009)
Log Message:
---
Bugfix: uv editor transform operators were not working anymore
after the recent retopo/snap commit.
Modified Paths:
--
trunk/blender/source/blender/editors/transform/transform_generics.c
Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===
--- trunk/blender/source/blender/editors/transform/transform_generics.c
2009-10-14 08:24:40 UTC (rev 23822)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c
2009-10-14 09:08:48 UTC (rev 23823)
@@ -617,6 +617,17 @@
}
}
}
+ else if (t-spacetype == SPACE_IMAGE) {
+ if (t-obedit t-obedit-type == OB_MESH) {
+ SpaceImage *sima= t-sa-spacedata.first;
+
+ flushTransUVs(t);
+ if(sima-flag SI_LIVE_UNWRAP)
+ ED_uvedit_live_unwrap_re_solve();
+
+ DAG_id_flush_update(t-obedit-data, OB_RECALC_DATA);
+ }
+ }
else if (t-spacetype == SPACE_VIEW3D) {
/* project */
@@ -652,27 +663,17 @@
if(la-editlatt-flag LT_OUTSIDE)
outside_lattice(la-editlatt);
}
else if (t-obedit-type == OB_MESH) {
- if(t-spacetype==SPACE_IMAGE) {
- SpaceImage *sima=
t-sa-spacedata.first;
+ EditMesh *em =
((Mesh*)t-obedit-data)-edit_mesh;
+ /* mirror modifier clipping? */
+ if(t-state != TRANS_CANCEL) {
+ clipMirrorModifier(t, t-obedit);
+ }
+ if((t-options CTX_NO_MIRROR) == 0
(t-flag T_MIRROR))
+ editmesh_apply_to_mirror(t);
- flushTransUVs(t);
- if(sima-flag SI_LIVE_UNWRAP)
-
ED_uvedit_live_unwrap_re_solve();
-
- DAG_id_flush_update(t-obedit-data,
OB_RECALC_DATA);
- } else {
- EditMesh *em =
((Mesh*)t-obedit-data)-edit_mesh;
- /* mirror modifier clipping? */
- if(t-state != TRANS_CANCEL) {
- clipMirrorModifier(t,
t-obedit);
- }
- if((t-options CTX_NO_MIRROR) == 0
(t-flag T_MIRROR))
- editmesh_apply_to_mirror(t);
-
- DAG_id_flush_update(t-obedit-data,
OB_RECALC_DATA); /* sets recalc flags */
-
- recalc_editnormals(em);
- }
+ DAG_id_flush_update(t-obedit-data,
OB_RECALC_DATA); /* sets recalc flags */
+
+ recalc_editnormals(em);
}
else if(t-obedit-type==OB_ARMATURE) { /* no recalc
flag, does pose */
bArmature *arm= t-obedit-data;
@@ -809,7 +810,7 @@
}
}
- if(t-spacetype==SPACE_VIEW3D ((View3D*)t-view)-drawtype
== OB_SHADED)
+ if(((View3D*)t-view)-drawtype == OB_SHADED)
reshadeall_displist(t-scene);
}
}
___
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 [23825] trunk/blender/source/blender/ render/intern/source/pipeline.c: Bugfix: compositing nodes + border render + crop didn't work correct.
Revision: 23825
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23825
Author: blendix
Date: 2009-10-14 11:40:09 +0200 (Wed, 14 Oct 2009)
Log Message:
---
Bugfix: compositing nodes + border render + crop didn't work correct.
Modified Paths:
--
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===
--- trunk/blender/source/blender/render/intern/source/pipeline.c
2009-10-14 09:08:53 UTC (rev 23824)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c
2009-10-14 09:40:09 UTC (rev 23825)
@@ -2116,6 +2116,11 @@
re-display_init(re-dih, re-result);
re-display_draw(re-ddh, re-result, NULL);
}
+ else {
+ /* set offset (again) for use in compositor,
disprect was manipulated. */
+ re-result-xof= 0;
+ re-result-yof= 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 [23829] trunk/blender/source/blender/ render/intern/source/texture.c: Bugfix: new bump mapping with UV coordinates wasn't working
Revision: 23829
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23829
Author: blendix
Date: 2009-10-14 13:17:59 +0200 (Wed, 14 Oct 2009)
Log Message:
---
Bugfix: new bump mapping with UV coordinates wasn't working
correct, my mistake in merging the patch.
Modified Paths:
--
trunk/blender/source/blender/render/intern/source/texture.c
Modified: trunk/blender/source/blender/render/intern/source/texture.c
===
--- trunk/blender/source/blender/render/intern/source/texture.c 2009-10-14
10:33:27 UTC (rev 23828)
+++ trunk/blender/source/blender/render/intern/source/texture.c 2009-10-14
11:17:59 UTC (rev 23829)
@@ -1736,6 +1736,16 @@
vlr_set_uv_indices(shi-vlr, j1, j2, j3);
+ // compute ortho basis
around normal
+ if(!nunvdone) {
+ // render
normal is negated
+ nn[0] =
-shi-vn[0];
+ nn[1] =
-shi-vn[1];
+ nn[2] =
-shi-vn[2];
+
VecOrthoBasisf(nn, nu, nv);
+ nunvdone= 1;
+ }
+
if (tf) {
float *uv1 =
tf-uv[j1], *uv2 = tf-uv[j2], *uv3 = tf-uv[j3];
const float
an[3] = {fabsf(nn[0]), fabsf(nn[1]), fabsf(nn[2])};
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
