remove po/ since the workflow for translations uses branches which isnt that useful...
authorCampbell Barton <ideasman42@gmail.com>
Sat, 5 Nov 2011 14:26:18 +0000 (14:26 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 5 Nov 2011 14:26:18 +0000 (14:26 +0000)
For now treat translations as binary files - just access from 'release/datafiles/locale'

GNUmakefile
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_markers.c
source/blender/makesdna/DNA_scene_types.h

index 30759f9..640e90d 100644 (file)
@@ -135,9 +135,6 @@ help:
        @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"
@@ -170,16 +167,6 @@ package_archive:
        @echo archive in "$(BUILD_DIR)/release"
 
 
-# -----------------------------------------------------------------------------
-# 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
 #
index a9de75d..f1e094c 100644 (file)
@@ -806,6 +806,8 @@ int scene_camera_switch_update(Scene *scene)
                scene->camera= camera;
                return 1;
        }
+#else
+       (void)scene;
 #endif
        return 0;
 }
index 9bde937..3e9b570 100644 (file)
@@ -1980,6 +1980,8 @@ static ImBuf * seq_render_scene_strip_impl(
        /* 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) {
index 13c2184..75b5213 100644 (file)
@@ -4539,6 +4539,8 @@ static void lib_link_scene(FileData *fd, Main *main)
                                        marker->camera= newlibadr(fd, sce->id.lib, marker->camera);
                                }
                        }
+#else
+                       (void)marker;
 #endif
 
                        if(sce->ed)
index 4a359ac..aa1af23 100644 (file)
@@ -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);
index de04e83..cc77df7 100644 (file)
@@ -31,7 +31,7 @@
  *  \ingroup DNA
  */
 
-// XXX, temp feature
+// XXX, temp feature - campbell
 #define DURIAN_CAMERA_SWITCH
 
 #ifdef __cplusplus