[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26260] trunk/blender/source/blender: Remove unneeded notifier data added in revision 26219.

Martin Poirier theeth at yahoo.com
Mon Jan 25 20:42:35 CET 2010


Revision: 26260
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26260
Author:   theeth
Date:     2010-01-25 20:42:33 +0100 (Mon, 25 Jan 2010)

Log Message:
-----------
Remove unneeded notifier data added in revision 26219.

Fix a lot of notifier calls to stop abusing ND_TRANSFORM and use more appropriate data flags.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26219

Modified Paths:
--------------
    trunk/blender/source/blender/editors/armature/editarmature.c
    trunk/blender/source/blender/editors/armature/poseSlide.c
    trunk/blender/source/blender/editors/armature/poselib.c
    trunk/blender/source/blender/editors/armature/poseobject.c
    trunk/blender/source/blender/editors/object/object_edit.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_graph/space_graph.c
    trunk/blender/source/blender/editors/space_nla/nla_buttons.c
    trunk/blender/source/blender/editors/space_nla/space_nla.c
    trunk/blender/source/blender/editors/space_outliner/outliner.c
    trunk/blender/source/blender/editors/space_outliner/space_outliner.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_view.c
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/makesrna/intern/rna_pose.c
    trunk/blender/source/blender/windowmanager/WM_types.h

Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c	2010-01-25 19:06:05 UTC (rev 26259)
+++ trunk/blender/source/blender/editors/armature/editarmature.c	2010-01-25 19:42:33 UTC (rev 26260)
@@ -632,7 +632,7 @@
 	applyarmature_fix_boneparents(scene, ob);
 	
 	/* note, notifier might evolve */
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, ob);
 	
 	return OPERATOR_FINISHED;
 }
@@ -1129,7 +1129,7 @@
 	ED_armature_to_edit(obedit);
 	
 	/* note, notifier might evolve */
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, obedit);
+	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, obedit);
 	
 	/* recalc/redraw + cleanup */
 	WM_cursor_wait(0);
@@ -1803,7 +1803,7 @@
 	
 	ED_armature_sync_selection(arm->edbo);
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, obedit);
+	WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, obedit);
 
 	return OPERATOR_FINISHED;
 }
@@ -2145,7 +2145,7 @@
 	
 
 	/* note, notifier might evolve */
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, ob);
 	
 	return OPERATOR_FINISHED;
 }
@@ -3176,7 +3176,7 @@
 	
 	/* updates */
 	ED_armature_sync_selection(arm->edbo);
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, obedit);
+	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, obedit);
 	
 	return OPERATOR_FINISHED;
 }
@@ -3467,7 +3467,7 @@
 		add_v3_v3v3(bone->tail, bone->head, imat[2]);	// bone with unit length 1, pointing up Z
 
 	/* note, notifier might evolve */
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, obedit);
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, obedit);
 	
 	return OPERATOR_FINISHED;
 }
@@ -3559,7 +3559,7 @@
 	CTX_DATA_END;
 	
 	/* note, notifier might evolve */
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, obedit);
+	WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, obedit);
 	
 	return OPERATOR_FINISHED;
 }
@@ -3729,7 +3729,7 @@
 	BLI_freelistN(&chains);	
 
 	/* note, notifier might evolve */
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, ob);
 	
 	return OPERATOR_FINISHED;
 }
@@ -3878,7 +3878,7 @@
 	
 
 	/* note, notifier might evolve */
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, ob);
 	
 	return OPERATOR_FINISHED;
 }
@@ -3956,7 +3956,7 @@
 	ED_armature_sync_selection(arm->edbo);
 
 	/* note, notifier might evolve */
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, ob);
 	
 	return OPERATOR_FINISHED;
 }

Modified: trunk/blender/source/blender/editors/armature/poseSlide.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseSlide.c	2010-01-25 19:06:05 UTC (rev 26259)
+++ trunk/blender/source/blender/editors/armature/poseSlide.c	2010-01-25 19:42:33 UTC (rev 26260)
@@ -287,7 +287,6 @@
 	
 	/* note, notifier might evolve */
 	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, pso->ob);
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);	
 }
 
 /* helper for apply() callabcks - find the next F-Curve with matching path... */

Modified: trunk/blender/source/blender/editors/armature/poselib.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poselib.c	2010-01-25 19:06:05 UTC (rev 26259)
+++ trunk/blender/source/blender/editors/armature/poselib.c	2010-01-25 19:42:33 UTC (rev 26260)
@@ -901,7 +901,7 @@
 	}
 	
 	/* request drawing of view + clear redraw flag */
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM|ND_POSE, pld->ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, pld->ob);
 	pld->redraw= PL_PREVIEW_NOREDRAW;
 }
 

Modified: trunk/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseobject.c	2010-01-25 19:06:05 UTC (rev 26259)
+++ trunk/blender/source/blender/editors/armature/poseobject.c	2010-01-25 19:42:33 UTC (rev 26260)
@@ -1089,7 +1089,7 @@
 	}
 	
 	/* notifiers for updates */
-	WM_event_add_notifier(C, NC_OBJECT|ND_POSE|ND_TRANSFORM, ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, ob);
 	WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL); // XXX not really needed, but here for completeness...
 
 	return OPERATOR_FINISHED;

Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c	2010-01-25 19:06:05 UTC (rev 26259)
+++ trunk/blender/source/blender/editors/object/object_edit.c	2010-01-25 19:42:33 UTC (rev 26260)
@@ -1656,7 +1656,7 @@
 	ED_objects_recalculate_paths(C, scene);
 	
 	/* notifiers for updates */
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, NULL);
 	
 	return OPERATOR_FINISHED; 
 }
@@ -1701,7 +1701,7 @@
 	ED_objects_clear_paths(C, scene);
 	
 	/* notifiers for updates */
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, NULL);
 	
 	return OPERATOR_FINISHED; 
 }

Modified: trunk/blender/source/blender/editors/space_action/space_action.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/space_action.c	2010-01-25 19:06:05 UTC (rev 26259)
+++ trunk/blender/source/blender/editors/space_action/space_action.c	2010-01-25 19:42:33 UTC (rev 26260)
@@ -326,10 +326,12 @@
 			break;
 		case NC_OBJECT:
 			switch(wmn->data) {
+				case ND_TRANSFORM:
+					/* moving object shouldn't need to redraw action */
+					break;
 				case ND_BONE_ACTIVE:
 				case ND_BONE_SELECT:
 				case ND_KEYS:
-				case ND_TRANSFORM:
 					ED_region_tag_redraw(ar);
 					break;
 			}
@@ -386,8 +388,9 @@
 					saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
 					ED_area_tag_refresh(sa);
 					break;
-				case ND_VIEW3D_TRANSFORM:
-					break; /*do nothing*/					
+				case ND_TRANSFORM:
+					/* moving object shouldn't need to redraw action */
+					break;
 				default: /* just redrawing the view will do */
 					ED_area_tag_redraw(sa);
 					break;

Modified: trunk/blender/source/blender/editors/space_buttons/space_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/space_buttons.c	2010-01-25 19:06:05 UTC (rev 26259)
+++ trunk/blender/source/blender/editors/space_buttons/space_buttons.c	2010-01-25 19:42:33 UTC (rev 26260)
@@ -279,6 +279,7 @@
 				case ND_TRANSFORM:
 					buttons_area_redraw(sa, BCONTEXT_OBJECT);
 					break;
+				case ND_POSE:
 				case ND_BONE_ACTIVE:
 				case ND_BONE_SELECT:
 					buttons_area_redraw(sa, BCONTEXT_BONE);
@@ -303,8 +304,6 @@
 					/* currently works by redraws... if preview is set, it (re)starts job */
 					sbuts->preview= 1;
 					break;
-				case ND_VIEW3D_TRANSFORM:
-					break; /*do nothing*/
 				default:
 					/* Not all object RNA props have a ND_ notifier (yet) */
 					ED_area_tag_redraw(sa);

Modified: trunk/blender/source/blender/editors/space_graph/space_graph.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/space_graph.c	2010-01-25 19:06:05 UTC (rev 26259)
+++ trunk/blender/source/blender/editors/space_graph/space_graph.c	2010-01-25 19:42:33 UTC (rev 26260)
@@ -462,7 +462,7 @@
 					sipo->flag |= SIPO_TEMP_NEEDCHANSYNC;
 					ED_area_tag_refresh(sa);
 					break;
-				case ND_VIEW3D_TRANSFORM:
+				case ND_TRANSFORM:
 					break; /*do nothing*/					
 					
 				default: /* just redrawing the view will do */

Modified: trunk/blender/source/blender/editors/space_nla/nla_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_buttons.c	2010-01-25 19:06:05 UTC (rev 26259)
+++ trunk/blender/source/blender/editors/space_nla/nla_buttons.c	2010-01-25 19:42:33 UTC (rev 26260)
@@ -97,7 +97,8 @@
 	}
 	
 	/* default for now */
-	WM_event_add_notifier(C, NC_SCENE|NC_OBJECT|ND_TRANSFORM, NULL);
+	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+	WM_event_add_notifier(C, NC_SCENE|ND_TRANSFORM, NULL);
 }
 
 static int nla_panel_context(const bContext *C, PointerRNA *adt_ptr, PointerRNA *nlt_ptr, PointerRNA *strip_ptr)

Modified: trunk/blender/source/blender/editors/space_nla/space_nla.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/space_nla.c	2010-01-25 19:06:05 UTC (rev 26259)
+++ trunk/blender/source/blender/editors/space_nla/space_nla.c	2010-01-25 19:42:33 UTC (rev 26260)
@@ -485,14 +485,14 @@
 			ED_area_tag_refresh(sa);
 			break;
 		case NC_OBJECT:
-			/*switch (wmn->data) {
-				case ND_BONE_SELECT:
-				case ND_BONE_ACTIVE:
+			switch (wmn->data) {
+				case ND_TRANSFORM:
+					/* do nothing */
+					break;
+				default:
 					ED_area_tag_refresh(sa);
 					break;
-			}*/
-			if (wmn->data != ND_VIEW3D_TRANSFORM)
-				ED_area_tag_refresh(sa);
+			}
 			break;
 		case NC_SPACE:
 			if(wmn->data == ND_SPACE_NLA)

Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-01-25 19:06:05 UTC (rev 26259)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-01-25 19:42:33 UTC (rev 26260)
@@ -2019,7 +2019,7 @@
 	if(set) {
 		if (ob->pose) {
 			ob->pose->active_group= te->index+1;
-			WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);
+			WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 		}
 	}
 	else {
@@ -4726,7 +4726,7 @@
 	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
 	object_handle_update(scene, ob);
 
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);
+	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 }
 
 static void restrictbutton_bone_cb(bContext *C, void *poin, void *poin2)

Modified: trunk/blender/source/blender/editors/space_outliner/space_outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/space_outliner.c	2010-01-25 19:06:05 UTC (rev 26259)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list