Changeset 4613 for nanovis/branches/1.1


Ignore:
Timestamp:
Aug 2, 2014, 2:08:58 PM (5 years ago)
Author:
ldelgass
Message:

merge r3598 from trunk

Location:
nanovis/branches/1.1
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1

  • nanovis/branches/1.1/FlowCmd.cpp

    r4612 r4613  
    984984}
    985985
     986#ifdef HAVE_FFMPEG
     987
    986988/**
    987989 * \brief Convert a Tcl_Obj representing the video format into its
     
    10601062    {Rappture::SWITCH_END}
    10611063};
    1062 
    1063 #ifdef HAVE_FFMPEG
    10641064
    10651065static int
  • nanovis/branches/1.1/Makefile.in

    r4612 r4613  
    276276ContourLineFilter.o: ContourLineFilter.cpp ContourLineFilter.h
    277277ConvexPolygon.o: ConvexPolygon.cpp ConvexPolygon.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h Plane.h
    278 Flow.o: Flow.h FlowCmd.h FlowTypes.h FlowBox.h FlowParticles.h Switch.h Trace.h
    279 FlowBox.o: FlowBox.h FlowTypes.h Switch.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h
     278Flow.o: Flow.cpp Flow.h FlowCmd.h FlowTypes.h FlowBox.h FlowParticles.h Switch.h Trace.h
     279FlowBox.o: FlowBox.cpp FlowBox.h FlowTypes.h Switch.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h
    280280FlowCmd.o: FlowCmd.cpp FlowCmd.h FlowParticles.h FlowBox.h FlowTypes.h Command.h Switch.h Trace.h TransferFunction.h nanovis.h CmdProc.h NvLIC.h Unirect.h Volume.h VelocityArrowsSlice.h $(VRMATH_DIR)/include/vrmath/Vector3f.h
    281 FlowParticles.o: FlowParticles.h FlowTypes.h FlowCmd.h Switch.h Trace.h NvParticleRenderer.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h
     281FlowParticles.o: FlowParticles.cpp FlowParticles.h FlowTypes.h FlowCmd.h Switch.h Trace.h NvParticleRenderer.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h
    282282GradientFilter.o: GradientFilter.cpp GradientFilter.h
    283283Grid.o: Grid.cpp Grid.h Axis.h Chain.h
Note: See TracChangeset for help on using the changeset viewer.