[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41564] trunk/blender: remove po/ since the workflow for translations uses branches which isnt that useful to have within blenders source dir .

[Campbell Barton]

Revision: 41564
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41564
Author:   campbellbarton
Date:     2011-11-05 14:26:18 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
remove po/ since the workflow for translations uses branches which isnt that useful to have within blenders source dir.

For now treat translations as binary files - just access from 'release/datafiles/locale'

Modified Paths:
--------------
    trunk/blender/GNUmakefile
    trunk/blender/source/blender/blenkernel/intern/scene.c
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/animation/anim_markers.c
    trunk/blender/source/blender/makesdna/DNA_scene_types.h

Property Changed:
----------------
    trunk/blender/


Property changes on: trunk/blender
___________________________________________________________________
Modified: svn:externals
   - po https://svn.blender.org/svnroot/bf-translations/trunk/po

   + 


Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile	2011-11-05 13:21:03 UTC (rev 41563)
+++ trunk/blender/GNUmakefile	2011-11-05 14:26:18 UTC (rev 41564)
@@ -135,9 +135,6 @@
 	@echo "  * package_pacman  - build an arch linux pacmanpackage"
 	@echo "  * package_archive - build an archive package"
 	@echo ""
-	@echo "Other Targets (not assosiated with building blender)"
-	@echo "  * translations  - update blenders translation files in po/"
-	@echo ""
 	@echo "Testing Targets (not assosiated with building blender)"
 	@echo "  * test            - run ctest, currently tests import/export, operator execution and that python modules load"
 	@echo "  * test_cmake      - runs our own cmake file checker which detects errors in the cmake file list definitions"
@@ -171,16 +168,6 @@
 
 
 # -----------------------------------------------------------------------------
-# Other Targets
-#
-translations:
-	$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python po/tools/update_msg.py
-	python3 po/tools/update_pot.py
-	python3 po/tools/update_po.py
-	python3 po/tools/update_mo.py
-
-
-# -----------------------------------------------------------------------------
 # Tests
 #
 test:

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2011-11-05 13:21:03 UTC (rev 41563)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2011-11-05 14:26:18 UTC (rev 41564)
@@ -806,6 +806,8 @@
 		scene->camera= camera;
 		return 1;
 	}
+#else
+	(void)scene;
 #endif
 	return 0;
 }

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2011-11-05 13:21:03 UTC (rev 41563)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2011-11-05 14:26:18 UTC (rev 41564)
@@ -1980,6 +1980,8 @@
 	/* stooping to new low's in hackyness :( */
 	oldmarkers= scene->markers;
 	scene->markers.first= scene->markers.last= NULL;
+#else
+	(void)oldmarkers;
 #endif
 	
 	if(sequencer_view3d_cb && BLI_thread_is_main() && doseq_gl && (scene == context.scene || have_seq==0) && camera) {

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-11-05 13:21:03 UTC (rev 41563)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-11-05 14:26:18 UTC (rev 41564)
@@ -4539,6 +4539,8 @@
 					marker->camera= newlibadr(fd, sce->id.lib, marker->camera);
 				}
 			}
+#else
+			(void)marker;
 #endif
 
 			if(sce->ed)

Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c	2011-11-05 13:21:03 UTC (rev 41563)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c	2011-11-05 14:26:18 UTC (rev 41564)
@@ -1069,6 +1069,8 @@
 		
 		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 @@
 	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);

Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h	2011-11-05 13:21:03 UTC (rev 41563)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h	2011-11-05 14:26:18 UTC (rev 41564)
@@ -31,7 +31,7 @@
  *  \ingroup DNA
  */
 
-// XXX, temp feature
+// XXX, temp feature - campbell
 #define DURIAN_CAMERA_SWITCH
 
 #ifdef __cplusplus