[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60130] branches/soc-2013-bge/source/ blender: Using NC_OBJECT|ND_LOD for notifications instead of NC_LOD.
Daniel Stokes
kupomail at gmail.com
Sat Sep 14 03:29:41 CEST 2013
Revision: 60130
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60130
Author: kupoman
Date: 2013-09-14 01:29:38 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
Using NC_OBJECT|ND_LOD for notifications instead of NC_LOD.
Modified Paths:
--------------
branches/soc-2013-bge/source/blender/editors/object/object_lod.c
branches/soc-2013-bge/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-bge/source/blender/windowmanager/WM_types.h
Modified: branches/soc-2013-bge/source/blender/editors/object/object_lod.c
===================================================================
--- branches/soc-2013-bge/source/blender/editors/object/object_lod.c 2013-09-14 00:41:31 UTC (rev 60129)
+++ branches/soc-2013-bge/source/blender/editors/object/object_lod.c 2013-09-14 01:29:38 UTC (rev 60130)
@@ -79,7 +79,7 @@
if(!BKE_object_lod_remove(ob, index))
return OPERATOR_CANCELLED;
- WM_event_add_notifier(C, NC_LOD, CTX_wm_view3d(C));
+ WM_event_add_notifier(C, NC_OBJECT|ND_LOD, CTX_wm_view3d(C));
return OPERATOR_FINISHED;
}
Modified: branches/soc-2013-bge/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- branches/soc-2013-bge/source/blender/editors/space_view3d/space_view3d.c 2013-09-14 00:41:31 UTC (rev 60129)
+++ branches/soc-2013-bge/source/blender/editors/space_view3d/space_view3d.c 2013-09-14 01:29:38 UTC (rev 60130)
@@ -768,6 +768,7 @@
case ND_CONSTRAINT:
case ND_KEYS:
case ND_PARTICLE:
+ case ND_LOD:
ED_region_tag_redraw(ar);
break;
}
@@ -894,10 +895,6 @@
if (wmn->action == NA_EDITED)
ED_region_tag_redraw(ar);
break;
- case NC_LOD:
- /* all lod ops for now */
- ED_region_tag_redraw(ar);
- break;
}
}
Modified: branches/soc-2013-bge/source/blender/makesrna/intern/rna_object.c
===================================================================
--- branches/soc-2013-bge/source/blender/makesrna/intern/rna_object.c 2013-09-14 00:41:31 UTC (rev 60129)
+++ branches/soc-2013-bge/source/blender/makesrna/intern/rna_object.c 2013-09-14 01:29:38 UTC (rev 60130)
@@ -2030,26 +2030,26 @@
prop = RNA_def_property(srna, "distance", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, "distance");
RNA_def_property_ui_text(prop, "Distance", "Distance to begin using this level of detail");
- RNA_def_property_update(prop, NC_LOD, "rna_Object_lod_distance_update");
+ RNA_def_property_update(prop, NC_OBJECT|ND_LOD, "rna_Object_lod_distance_update");
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "source");
RNA_def_property_struct_type(prop, "Object");
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Object", "Object to use for this level of detail");
- RNA_def_property_update(prop, NC_LOD, NULL);
+ RNA_def_property_update(prop, NC_OBJECT|ND_LOD, NULL);
prop = RNA_def_property(srna, "use_mesh", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", OB_LOD_USE_MESH);
RNA_def_property_ui_text(prop, "Use Mesh", "Use the mesh from this object at this level of detail");
RNA_def_property_ui_icon(prop, ICON_MESH_DATA, 0);
- RNA_def_property_update(prop, NC_LOD, NULL);
+ RNA_def_property_update(prop, NC_OBJECT|ND_LOD, NULL);
prop = RNA_def_property(srna, "use_material", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", OB_LOD_USE_MAT);
RNA_def_property_ui_text(prop, "Use Material", "Use the material from this object at this level of detail");
RNA_def_property_ui_icon(prop, ICON_MATERIAL, 0);
- RNA_def_property_update(prop, NC_LOD, NULL);
+ RNA_def_property_update(prop, NC_OBJECT|ND_LOD, NULL);
}
@@ -2718,7 +2718,7 @@
RNA_def_property_collection_sdna(prop, NULL, "lodlevels", NULL);
RNA_def_property_struct_type(prop, "LodLevel");
RNA_def_property_ui_text(prop, "Level of Detail Levels", "A collection of detail levels to automatically switch between");
- RNA_def_property_update(prop, NC_LOD, NULL);
+ RNA_def_property_update(prop, NC_OBJECT|ND_LOD, NULL);
RNA_api_object(srna);
}
Modified: branches/soc-2013-bge/source/blender/windowmanager/WM_types.h
===================================================================
--- branches/soc-2013-bge/source/blender/windowmanager/WM_types.h 2013-09-14 00:41:31 UTC (rev 60129)
+++ branches/soc-2013-bge/source/blender/windowmanager/WM_types.h 2013-09-14 01:29:38 UTC (rev 60130)
@@ -241,7 +241,6 @@
#define NC_MASK (21<<24)
#define NC_GPENCIL (22<<24)
#define NC_LINESTYLE (23<<24)
-#define NC_LOD (24<<24)
/* data type, 256 entries is enough, it can overlap */
#define NOTE_DATA 0x00FF0000
@@ -299,6 +298,7 @@
#define ND_PARTICLE (27<<16)
#define ND_POINTCACHE (28<<16)
#define ND_PARENT (29<<16)
+#define ND_LOD (30<<16)
/* NC_MATERIAL Material */
#define ND_SHADING (30<<16)
More information about the Bf-blender-cvs
mailing list