Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-11-05 18:26:18 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-05 18:26:18 +0400
commit2a7ade9de24860bbd13e4be8480e9285d1f3fe4c (patch)
treed4def875a4c5261cf4a05065c1235730a0eab886 /source/blender
parent885d1e6ed37ff725d920cf7c7b05c4e0fede2102 (diff)
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'
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/scene.c2
-rw-r--r--source/blender/blenkernel/intern/sequencer.c2
-rw-r--r--source/blender/blenloader/intern/readfile.c2
-rw-r--r--source/blender/editors/animation/anim_markers.c4
-rw-r--r--source/blender/makesdna/DNA_scene_types.h2
5 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index a9de75dc7d0..f1e094c3909 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -806,6 +806,8 @@ int scene_camera_switch_update(Scene *scene)
scene->camera= camera;
return 1;
}
+#else
+ (void)scene;
#endif
return 0;
}
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 9bde9374ab7..3e9b570d104 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -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) {
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 13c21840459..75b5213d576 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -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)
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 4a359acabd9..aa1af231afd 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -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/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index de04e83e569..cc77df7e679 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -31,7 +31,7 @@
* \ingroup DNA
*/
-// XXX, temp feature
+// XXX, temp feature - campbell
#define DURIAN_CAMERA_SWITCH
#ifdef __cplusplus