Merged changes in the trunk up to revision 41638.

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

4 files changed, 10 insertions, 56 deletions

diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 450d0ba7341..eab71323494 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -177,13 +177,13 @@ static void acf_generic_channel_color(bAnimContext *ac, bAnimListElem *ale, floa
 		unsigned char cp[3];
 		
 		if (indent == 2) {
-			VECCOPY(cp, grp->cs.solid);
+			copy_v3_v3_char((char *)cp, grp->cs.solid);
 		}
 		else if (indent == 1) {
-			VECCOPY(cp, grp->cs.select);
+			copy_v3_v3_char((char *)cp, grp->cs.select);
 		}
 		else {
-			VECCOPY(cp, grp->cs.active);
+			copy_v3_v3_char((char *)cp, grp->cs.active);
 		}
 		
 		/* copy the colors over, transforming from bytes to floats */
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c
index 2774bd2cda4..569125e1055 100644
--- a/source/blender/editors/animation/anim_draw.c
+++ b/source/blender/editors/animation/anim_draw.c
@@ -237,28 +237,6 @@ void ANIM_draw_cfra (const bContext *C, View2D *v2d, short flag)
 		glVertex2fv(vec);
 	glEnd();
 	
-	/* Draw dark green line if slow-parenting/time-offset is enabled */
-	if (flag & DRAWCFRA_SHOW_TIMEOFS) {
-		Object *ob= OBACT;
-		if(ob) {
-			float timeoffset= give_timeoffset(ob);
-			// XXX ob->ipoflag is depreceated!
-			if ((ob->ipoflag & OB_OFFS_OB) && (timeoffset != 0.0f)) {
-				vec[0]-= timeoffset; /* could avoid calling twice */
-				
-				UI_ThemeColorShade(TH_CFRAME, -30);
-				
-				glBegin(GL_LINE_STRIP);
-					/*vec[1]= v2d->cur.ymax;*/ // this is set already. this line is only included
-					glVertex2fv(vec);
-					
-					vec[1]= v2d->cur.ymin;
-					glVertex2fv(vec);
-				glEnd();
-			}
-		}
-	}
-	
 	glLineWidth(1.0);
 	
 	/* Draw current frame number in a little box */
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 5345fcd756d..aa1af231afd 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -777,7 +777,7 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, wmEvent *evt)
 				
 				fac= ((float)(evt->x - mm->firstx)*dx);
 				
-				if (ELEM(mm->slink->spacetype, SPACE_TIME, SPACE_SOUND)) 
+				if (mm->slink->spacetype == SPACE_TIME) 
 					apply_keyb_grid(evt->shift, evt->ctrl, &fac, 0.0, FPS, 0.1*FPS, 0);
 				else
 					apply_keyb_grid(evt->shift, evt->ctrl, &fac, 0.0, 1.0, 0.1, 0 /*was: U.flag & USER_AUTOGRABGRID*/);
@@ -796,7 +796,7 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, wmEvent *evt)
 				
 				if (totmark==1) {	
 					/* we print current marker value */
-					if (ELEM(mm->slink->spacetype, SPACE_TIME, SPACE_SOUND)) {
+					if (mm->slink->spacetype == SPACE_TIME) {
 						SpaceTime *stime= (SpaceTime *)mm->slink;
 						if (stime->flag & TIME_DRAWFRAMES) 
 							BLI_snprintf(str, sizeof(str), "Marker %d offset %d", selmarker->frame, offs);
@@ -816,7 +816,7 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, wmEvent *evt)
 				}
 				else {
 					/* we only print the offset */
-					if (ELEM(mm->slink->spacetype, SPACE_TIME, SPACE_SOUND)) { 
+					if (mm->slink->spacetype == SPACE_TIME) { 
 						SpaceTime *stime= (SpaceTime *)mm->slink;
 						if (stime->flag & TIME_DRAWFRAMES) 
 							BLI_snprintf(str, sizeof(str), "Marker offset %d ", offs);
@@ -1069,6 +1069,8 @@ static int ed_marker_select(bContext *C, wmEvent *evt, int extend, int camera)
 		
 		WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
 	}
+#else
+	(void)camera;
 #endif
 
 	WM_event_add_notifier(C, NC_SCENE|ND_MARKERS, NULL);
@@ -1493,6 +1495,8 @@ void ED_marker_keymap(wmKeyConfig *keyconf)
 	kmi= WM_keymap_add_item(keymap, "MARKER_OT_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
 	RNA_boolean_set(kmi->ptr, "extend", 1);
 	RNA_boolean_set(kmi->ptr, "camera", 1);
+#else
+	(void)kmi;
 #endif
 	
 	WM_keymap_verify_item(keymap, "MARKER_OT_select_border", BKEY, KM_PRESS, 0, 0);
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index fb34245d338..9f466ef52d3 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -911,20 +911,6 @@ short insert_keyframe (ReportList *reports, ID *id, bAction *act, const char gro
 		/* apply NLA-mapping to frame to use (if applicable) */
 		cfra= BKE_nla_tweakedit_remap(adt, cfra, NLATIME_CONVERT_UNMAP);
 	}
-
-#if 0
-	/* apply special time tweaking */
-		// XXX check on this stuff...
-	if (GS(id->name) == ID_OB) {
-		//Object *ob= (Object *)id;
-		
-		/* ancient time-offset cruft */
-		//if ( (ob->ipoflag & OB_OFFS_OB) && (give_timeoffset(ob)) ) {
-		//	/* actually frametofloat calc again! */
-		//	cfra-= give_timeoffset(ob)*scene->r.framelen;
-		//}
-	}
-#endif
 	
 	/* key entire array convenience method */
 	if (array_index == -1) { 
@@ -1018,20 +1004,6 @@ short delete_keyframe (ReportList *reports, ID *id, bAction *act, const char gro
 		}
 	}
 	
-#if 0
-	/* apply special time tweaking */
-		// XXX check on this stuff...
-	if (GS(id->name) == ID_OB) {
-		//Object *ob= (Object *)id;
-		
-		/* ancient time-offset cruft */
-		//if ( (ob->ipoflag & OB_OFFS_OB) && (give_timeoffset(ob)) ) {
-		//	/* actually frametofloat calc again! */
-		//	cfra-= give_timeoffset(ob)*scene->r.framelen;
-		//}
-	}
-#endif
-	
 	/* key entire array convenience method */
 	if (array_index == -1) { 
 		array_index= 0;