[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41984] trunk/blender/source: - rename MovieTrackingMarker.enabled --> mute, to match constraints/nla/ fcurves/sequencer

[Campbell Barton]

Revision: 41984
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41984
Author:   campbellbarton
Date:     2011-11-19 02:48:09 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
- rename MovieTrackingMarker.enabled --> mute, to match constraints/nla/fcurves/sequencer
- report an error if an invalid BGpic arg is given to v3d.background_images.remove()

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_space.c
    trunk/blender/source/blender/makesrna/intern/rna_tracking.c
    trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2011-11-19 01:24:40 UTC (rev 41983)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2011-11-19 02:48:09 UTC (rev 41984)
@@ -900,11 +900,15 @@
 	return bgpic;
 }
 
-static void rna_BackgroundImage_remove(View3D *v3d, BGpic *bgpic)
+static void rna_BackgroundImage_remove(View3D *v3d, ReportList *reports, BGpic *bgpic)
 {
-	ED_view3D_background_image_remove(v3d, bgpic);
-
-	WM_main_add_notifier(NC_SPACE|ND_SPACE_VIEW3D, v3d);
+	if (BLI_findindex(&v3d->bgpicbase, bgpic) == -1) {
+		BKE_report(reports, RPT_ERROR, "BackgroundImage can't be removed");
+	}
+	else {
+		ED_view3D_background_image_remove(v3d, bgpic);
+		WM_main_add_notifier(NC_SPACE|ND_SPACE_VIEW3D, v3d);
+	}
 }
 
 /* Space Node Editor */
@@ -1321,6 +1325,7 @@
 
 	func= RNA_def_function(srna, "remove", "rna_BackgroundImage_remove");
 	RNA_def_function_ui_description(func, "Remove background image");
+	RNA_def_function_flag(func, FUNC_USE_REPORTS);
 	parm= RNA_def_pointer(func, "image", "BackgroundImage", "", "Image displayed as viewport background");
 	RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
 }

Modified: trunk/blender/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_tracking.c	2011-11-19 01:24:40 UTC (rev 41983)
+++ trunk/blender/source/blender/makesrna/intern/rna_tracking.c	2011-11-19 02:48:09 UTC (rev 41984)
@@ -451,9 +451,9 @@
 	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, NULL);
 
 	/* enable */
-	prop= RNA_def_property(srna, "enable", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", MARKER_DISABLED);
-	RNA_def_property_ui_text(prop, "Enable", "Is marker enabled for current frame");
+	prop= RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", MARKER_DISABLED);
+	RNA_def_property_ui_text(prop, "Mode", "Is marker muted for current frame");
 	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, NULL);
 }
 

Modified: trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp	2011-11-19 01:24:40 UTC (rev 41983)
+++ trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp	2011-11-19 02:48:09 UTC (rev 41984)
@@ -1362,14 +1362,17 @@
 	
 	int attr=0;
 	
-	if(!PyArg_ParseTuple(args, "i:setAttrib", &attr ))
+	if(!PyArg_ParseTuple(args, "i:setAttrib", &attr))
 		return NULL;
-	
+
+	attr= SHD_TANGENT; /* user input is ignored for now, there is only 1 attr */
+
 	if(mShader==0) {
 		PyErr_SetString(PyExc_ValueError, "shader.setAttrib() BL_Shader, invalid shader object");
 		return NULL;
 	}
-	mAttr=SHD_TANGENT; /* What the heck is going on here - attr is just ignored??? - Campbell */
+
+	mAttr= attr;
 	glUseProgramObjectARB(mShader);
 	glBindAttribLocationARB(mShader, mAttr, "Tangent");
 	Py_RETURN_NONE;