diff options
| -rw-r--r-- | GNUmakefile | 13 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 |
6 files changed, 11 insertions, 14 deletions
diff --git a/GNUmakefile b/GNUmakefile index 30759f909fc..640e90de74b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -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" @@ -171,16 +168,6 @@ package_archive: # ----------------------------------------------------------------------------- -# 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: 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 |