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'
This commit is contained in:
13
GNUmakefile
13
GNUmakefile
@@ -135,9 +135,6 @@ help:
|
|||||||
@echo " * package_pacman - build an arch linux pacmanpackage"
|
@echo " * package_pacman - build an arch linux pacmanpackage"
|
||||||
@echo " * package_archive - build an archive package"
|
@echo " * package_archive - build an archive package"
|
||||||
@echo ""
|
@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 "Testing Targets (not assosiated with building blender)"
|
||||||
@echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
|
@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"
|
@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"
|
@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
|
# Tests
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -806,6 +806,8 @@ int scene_camera_switch_update(Scene *scene)
|
|||||||
scene->camera= camera;
|
scene->camera= camera;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
(void)scene;
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1980,6 +1980,8 @@ static ImBuf * seq_render_scene_strip_impl(
|
|||||||
/* stooping to new low's in hackyness :( */
|
/* stooping to new low's in hackyness :( */
|
||||||
oldmarkers= scene->markers;
|
oldmarkers= scene->markers;
|
||||||
scene->markers.first= scene->markers.last= NULL;
|
scene->markers.first= scene->markers.last= NULL;
|
||||||
|
#else
|
||||||
|
(void)oldmarkers;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(sequencer_view3d_cb && BLI_thread_is_main() && doseq_gl && (scene == context.scene || have_seq==0) && camera) {
|
if(sequencer_view3d_cb && BLI_thread_is_main() && doseq_gl && (scene == context.scene || have_seq==0) && camera) {
|
||||||
|
|||||||
@@ -4539,6 +4539,8 @@ static void lib_link_scene(FileData *fd, Main *main)
|
|||||||
marker->camera= newlibadr(fd, sce->id.lib, marker->camera);
|
marker->camera= newlibadr(fd, sce->id.lib, marker->camera);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
(void)marker;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(sce->ed)
|
if(sce->ed)
|
||||||
|
|||||||
@@ -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);
|
WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
(void)camera;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
WM_event_add_notifier(C, NC_SCENE|ND_MARKERS, NULL);
|
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);
|
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, "extend", 1);
|
||||||
RNA_boolean_set(kmi->ptr, "camera", 1);
|
RNA_boolean_set(kmi->ptr, "camera", 1);
|
||||||
|
#else
|
||||||
|
(void)kmi;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
WM_keymap_verify_item(keymap, "MARKER_OT_select_border", BKEY, KM_PRESS, 0, 0);
|
WM_keymap_verify_item(keymap, "MARKER_OT_select_border", BKEY, KM_PRESS, 0, 0);
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
* \ingroup DNA
|
* \ingroup DNA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// XXX, temp feature
|
// XXX, temp feature - campbell
|
||||||
#define DURIAN_CAMERA_SWITCH
|
#define DURIAN_CAMERA_SWITCH
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|||||||
Reference in New Issue
Block a user