Revision: 21133
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21133
Author: ton
Date: 2009-06-24 19:22:22 +0200 (Wed, 24 Jun 2009)
Log Message:
-----------
2.5
- Added ND_SHADING notifier on linking materials, so it gives
refreshes in UI
- Removed reduntant debug prints
Crucial fixes in other code while checking warnings;
- Particle buttons were assigned to short, whilst data was int
- Filesel border select used float rect API, on an int rect.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
branches/blender2.5/blender/source/blender/editors/physics/ed_pointcache.c
branches/blender2.5/blender/source/blender/editors/space_buttons/space_buttons.c
branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
branches/blender2.5/blender/source/blender/editors/space_file/filesel.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
2009-06-24 16:44:54 UTC (rev 21132)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
2009-06-24 17:22:22 UTC (rev 21133)
@@ -1438,7 +1438,6 @@
}
}
else if(inbox) {
- printf("release inside \n");
button_activate_state(C, but,
BUTTON_STATE_EXIT);
retval= WM_UI_HANDLER_BREAK;
}
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
2009-06-24 16:44:54 UTC (rev 21132)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
2009-06-24 17:22:22 UTC (rev 21133)
@@ -27,9 +27,12 @@
#include "MEM_guardedalloc.h"
+#include "DNA_screen_types.h"
+
#include "BLI_string.h"
#include "BKE_context.h"
+#include "BKE_icons.h"
#include "BKE_library.h"
#include "BKE_utildefines.h"
Modified:
branches/blender2.5/blender/source/blender/editors/physics/ed_pointcache.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/physics/ed_pointcache.c
2009-06-24 16:44:54 UTC (rev 21132)
+++ branches/blender2.5/blender/source/blender/editors/physics/ed_pointcache.c
2009-06-24 17:22:22 UTC (rev 21133)
@@ -83,7 +83,7 @@
baker.render = 0;
baker.break_test = cache_break_test;
baker.break_data = NULL;
- baker.progressbar = WM_timecursor;
+ baker.progressbar = (void (*)(void *, int))WM_timecursor;
baker.progresscontext = CTX_wm_window(C);
BKE_ptcache_make_cache(&baker);
@@ -170,7 +170,7 @@
baker.render = 0;
baker.break_test = cache_break_test;
baker.break_data = NULL;
- baker.progressbar = WM_timecursor;
+ baker.progressbar = (void (*)(void *, int))WM_timecursor;
baker.progresscontext = CTX_wm_window(C);
BKE_ptcache_make_cache(&baker);
Modified:
branches/blender2.5/blender/source/blender/editors/space_buttons/space_buttons.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_buttons/space_buttons.c
2009-06-24 16:44:54 UTC (rev 21132)
+++
branches/blender2.5/blender/source/blender/editors/space_buttons/space_buttons.c
2009-06-24 17:22:22 UTC (rev 21133)
@@ -343,6 +343,11 @@
case ND_GEOM_SELECT:
ED_area_tag_redraw(sa);
break;
+ case ND_SHADING:
+ case ND_SHADING_DRAW:
+ /* currently works by redraws... if
preview is set, it (re)starts job */
+ sbuts->preview= 1;
+ break;
}
break;
case NC_MATERIAL:
@@ -353,7 +358,6 @@
case ND_SHADING_DRAW:
/* currently works by redraws... if
preview is set, it (re)starts job */
sbuts->preview= 1;
- printf("shader notifier \n");
break;
}
break;
Modified:
branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
2009-06-24 16:44:54 UTC (rev 21132)
+++ branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
2009-06-24 17:22:22 UTC (rev 21133)
@@ -190,7 +190,7 @@
rect.xmax= RNA_int_get(op->ptr, "xmax");
rect.ymax= RNA_int_get(op->ptr, "ymax");
- BLI_isect_rctf(&(ar->v2d.mask), &rect, &rect);
+ BLI_isect_rcti(&(ar->v2d.mask), &rect, &rect);
file_select(sfile, ar, &rect, val );
WM_event_add_notifier(C, NC_WINDOW, NULL);
Modified:
branches/blender2.5/blender/source/blender/editors/space_file/filesel.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/filesel.c
2009-06-24 16:44:54 UTC (rev 21132)
+++ branches/blender2.5/blender/source/blender/editors/space_file/filesel.c
2009-06-24 17:22:22 UTC (rev 21133)
@@ -159,7 +159,7 @@
{
uiStyle *style= U.uistyles.first;
uiStyleFontSet(&style->widget);
- return BLF_width(str);
+ return BLF_width((char *)str);
}
float file_font_pointsize()
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
2009-06-24 16:44:54 UTC (rev 21132)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
2009-06-24 17:22:22 UTC (rev 21133)
@@ -5513,11 +5513,11 @@
}
else if(G.f & G_PARTICLEEDIT) {
uiBlockBeginAlign(block);
- uiDefIconButBitS(block, TOG, SCE_SELECT_PATH,
B_SEL_PATH, ICON_EDGESEL, xco,yco,XIC,YIC, &ts->particle.selectmode, 1.0, 0.0,
0, 0, "Path edit mode");
+ uiDefIconButBitI(block, TOG, SCE_SELECT_PATH,
B_SEL_PATH, ICON_EDGESEL, xco,yco,XIC,YIC, &ts->particle.selectmode, 1.0, 0.0,
0, 0, "Path edit mode");
xco+= XIC;
- uiDefIconButBitS(block, TOG, SCE_SELECT_POINT,
B_SEL_POINT, ICON_VERTEXSEL, xco,yco,XIC,YIC, &ts->particle.selectmode, 1.0,
0.0, 0, 0, "Point select mode");
+ uiDefIconButBitI(block, TOG, SCE_SELECT_POINT,
B_SEL_POINT, ICON_VERTEXSEL, xco,yco,XIC,YIC, &ts->particle.selectmode, 1.0,
0.0, 0, 0, "Point select mode");
xco+= XIC;
- uiDefIconButBitS(block, TOG, SCE_SELECT_END, B_SEL_END,
ICON_FACESEL, xco,yco,XIC,YIC, &ts->particle.selectmode, 1.0, 0.0, 0, 0, "Tip
select mode");
+ uiDefIconButBitI(block, TOG, SCE_SELECT_END, B_SEL_END,
ICON_FACESEL, xco,yco,XIC,YIC, &ts->particle.selectmode, 1.0, 0.0, 0, 0, "Tip
select mode");
xco+= XIC;
uiBlockEndAlign(block);
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
2009-06-24 16:44:54 UTC (rev 21132)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
2009-06-24 17:22:22 UTC (rev 21133)
@@ -409,11 +409,13 @@
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_pointer_funcs(prop, "rna_MaterialSlot_material_get",
"rna_MaterialSlot_material_set", NULL);
RNA_def_property_ui_text(prop, "Material", "Material datablock used by
this material slot.");
+ RNA_def_property_update(prop, NC_OBJECT|ND_SHADING,
"rna_Object_update");
prop= RNA_def_property(srna, "link", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, link_items);
RNA_def_property_enum_funcs(prop, "rna_MaterialSlot_link_get",
"rna_MaterialSlot_link_set", NULL);
RNA_def_property_ui_text(prop, "Link", "Link material to object or the
object's data.");
+ RNA_def_property_update(prop, NC_OBJECT|ND_SHADING,
"rna_Object_update");
prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
RNA_def_property_string_funcs(prop, "rna_MaterialSlot_name_get",
"rna_MaterialSlot_name_length", NULL);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
