Revision: 40213
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40213
Author: campbellbarton
Date: 2011-09-15 07:06:45 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
replace rna_update_active_object with NC_GEOM|ND_DATA notifier (as pointed out
by Matt Ebb), also some whitespace edits to match trunk.
Modified Paths:
--------------
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-radish/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_scene.c
Modified:
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_header.c
===================================================================
---
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_header.c
2011-09-15 00:06:49 UTC (rev 40212)
+++
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_header.c
2011-09-15 07:06:45 UTC (rev 40213)
@@ -498,6 +498,7 @@
/* Manipulators aren't used in weight paint mode */
PointerRNA meshptr;
+
RNA_pointer_create(&ob->id, &RNA_Mesh, ob->data, &meshptr);
if(ob->mode & (OB_MODE_TEXTURE_PAINT|OB_MODE_VERTEX_PAINT)) {
uiItemR(layout, &meshptr, "use_paint_mask",
UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
Modified:
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_select.c
===================================================================
---
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_select.c
2011-09-15 00:06:49 UTC (rev 40212)
+++
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_select.c
2011-09-15 07:06:45 UTC (rev 40213)
@@ -646,6 +646,7 @@
ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's
screen/vert projection */
nurbs_foreachScreenVert(vc, do_lasso_select_curve__doSelect, &data);
}
+
static void do_lasso_select_lattice__doSelect(void *userData, BPoint *bp, int
x, int y)
{
struct { int (*mcords)[2]; short moves; short select; } *data =
userData;
@@ -2086,7 +2087,6 @@
eve->f = data->select?(eve->f|1):(eve->f&~1);
}
}
-
static void mesh_circle_doSelectEdge(void *userData, EditEdge *eed, int x0,
int y0, int x1, int y1, int UNUSED(index))
{
struct {ViewContext *vc; short select; int mval[2]; float radius; }
*data = userData;
Modified: branches/soc-2011-radish/source/blender/makesrna/intern/rna_internal.h
===================================================================
--- branches/soc-2011-radish/source/blender/makesrna/intern/rna_internal.h
2011-09-15 00:06:49 UTC (rev 40212)
+++ branches/soc-2011-radish/source/blender/makesrna/intern/rna_internal.h
2011-09-15 07:06:45 UTC (rev 40213)
@@ -215,8 +215,6 @@
void rna_Object_internal_update_data(struct Main *bmain, struct Scene *scene,
struct PointerRNA *ptr);
void rna_Mesh_update_draw(struct Main *bmain, struct Scene *scene, struct
PointerRNA *ptr);
void rna_TextureSlot_update(struct Main *bmain, struct Scene *scene, struct
PointerRNA *ptr);
-//Jason
-void rna_update_active_object(struct Main *bmain, struct Scene *scene, struct
PointerRNA *ptr);
/* basic poll functions for object types */
int rna_Armature_object_poll(struct PointerRNA *ptr, struct PointerRNA value);
Modified: branches/soc-2011-radish/source/blender/makesrna/intern/rna_object.c
===================================================================
--- branches/soc-2011-radish/source/blender/makesrna/intern/rna_object.c
2011-09-15 00:06:49 UTC (rev 40212)
+++ branches/soc-2011-radish/source/blender/makesrna/intern/rna_object.c
2011-09-15 07:06:45 UTC (rev 40213)
@@ -220,16 +220,6 @@
DAG_id_tag_update(ptr->id.data, OB_RECALC_DATA);
WM_main_add_notifier(NC_OBJECT|ND_DRAW, ptr->id.data);
}
-// Jason
-void rna_update_active_object(Main *bmain, Scene *scene, PointerRNA *ptr)
-{
- Object *ob;
- Base *basact = scene->basact;
- if(basact && (ob = basact->object)) {
- DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
- WM_main_add_notifier(NC_OBJECT|ND_DRAW, &ob->id);
- }
-}
void rna_Object_active_shape_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
Modified: branches/soc-2011-radish/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/soc-2011-radish/source/blender/makesrna/intern/rna_scene.c
2011-09-15 00:06:49 UTC (rev 40212)
+++ branches/soc-2011-radish/source/blender/makesrna/intern/rna_scene.c
2011-09-15 07:06:45 UTC (rev 40213)
@@ -1120,14 +1120,14 @@
RNA_def_property_ui_text(prop, "WPaint Auto-Normalize",
"Ensure all bone-deforming vertex groups add up to 1.0 while "
"weight painting");
- RNA_def_property_update(prop, 0, "rna_update_active_object");
+ RNA_def_property_update(prop, NC_GEOM|ND_DATA, 0);
prop = RNA_def_property(srna, "use_multipaint", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "multipaint", 1);
RNA_def_property_ui_text(prop, "WPaint Multi-Paint",
"Paint across all selected bones while "
"weight painting");
- RNA_def_property_update(prop, 0, "rna_update_active_object");
+ RNA_def_property_update(prop, NC_GEOM|ND_DATA, 0);
prop= RNA_def_property(srna, "vertex_paint", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "vpaint");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
