[Bf-blender-cvs] [d7ddffd] gooseberry: Merge branch 'master' into gooseberry

[Sergey Sharybin]

Commit: d7ddffdcce6db03e63c09c566b57a1252101058f
Author: Sergey Sharybin
Date:   Mon Mar 30 13:50:59 2015 +0500
Branches: gooseberry
https://developer.blender.org/rBd7ddffdcce6db03e63c09c566b57a1252101058f

Merge branch 'master' into gooseberry

Conflicts:
	release/scripts/startup/bl_ui/properties_physics_smoke.py
	source/blender/editors/include/ED_transform.h
	source/blender/editors/space_view3d/view3d_intern.h

===================================================================



===================================================================

diff --cc intern/cycles/app/cycles_standalone.cpp
index 28fecbf,72bd635..55d1f2b
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@@ -130,25 -120,11 +130,25 @@@ static void scene_init(
  {
  	options.scene = new Scene(options.scene_params, options.session_params.device);
  
 -	/* Read XML */
 -	xml_read_file(options.scene, options.filepath.c_str());
 +	/* Read file */
 +	switch (options.filetype) {
 +		case FILETYPE_XML:
 +			xml_read_file(options.scene, options.filepath.c_str());
 +			break;
 +#ifdef WITH_ALEMBIC
 +		case FILETYPE_ABC_OGAWA:
 +			abc_read_ogawa_file(options.scene, options.filepath.c_str());
 +			break;
 +		case FILETYPE_ABC_HDF5:
 +			abc_read_hdf5_file(options.scene, options.filepath.c_str());
 +			break;
 +#endif
 +		default:
 +			return;
 +	}
  
  	/* Camera width/height override? */
- 	if (!(options.width == 0 || options.height == 0)) {
+ 	if(!(options.width == 0 || options.height == 0)) {
  		options.scene->camera->width = options.width;
  		options.scene->camera->height = options.height;
  	}
diff --cc release/scripts/startup/bl_ui/properties_physics_smoke.py
index 74d9019,85d3c1d..f2dc178
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@@ -81,9 -81,7 +81,9 @@@ class PHYSICS_PT_smoke(PhysicButtonsPan
  
              layout.prop(flow, "smoke_flow_type", expand=False)
  
-             if flow.smoke_flow_type != "OUTFLOW":
+             if flow.smoke_flow_type != 'OUTFLOW':
 +                use_const_color = False
 +
                  split = layout.split()
                  col = split.column()
                  col.label(text="Flow Source:")
diff --cc source/blender/blenkernel/BKE_key.h
index 61aac25,08fa096..fc7ab6a
--- a/source/blender/blenkernel/BKE_key.h
+++ b/source/blender/blenkernel/BKE_key.h
@@@ -38,10 -38,8 +38,9 @@@ struct ID
  struct ListBase;
  struct Curve;
  struct Object;
- struct Scene;
  struct Lattice;
  struct Mesh;
 +struct ParticleSystem;
  struct WeightsArrayCache;
  
  /* Kernel prototypes */
diff --cc source/blender/blenkernel/BKE_mesh.h
index 003d3ff,5cf557a..a5d4abc
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@@ -39,9 -38,7 +38,8 @@@ struct ListBase
  struct LinkNode;
  struct BLI_Stack;
  struct MemArena;
- struct BMEditMesh;
  struct BMesh;
 +struct DupliObjectData;
  struct Main;
  struct Mesh;
  struct MPoly;
diff --cc source/blender/editors/include/ED_mesh.h
index b144fd2,8fb6fcb..c570432
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@@ -39,15 -39,11 +39,12 @@@ struct ID
  struct View3D;
  struct ARegion;
  struct bContext;
 +struct bFaceMap;
  struct wmOperator;
- struct wmWindowManager;
  struct wmKeyConfig;
  struct ReportList;
- struct EditSelection;
  struct ViewContext;
  struct bDeformGroup;
- struct MDeformWeight;
  struct MDeformVert;
  struct Scene;
  struct Mesh;
diff --cc source/blender/editors/include/ED_transform.h
index 8382428,478cb92..36d9417
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@@ -45,8 -43,6 +43,7 @@@ struct wmEvent
  struct wmKeyConfig;
  struct wmKeyMap;
  struct wmOperatorType;
- struct wmWindowManager;
- struct PointerRNA;
++/*struct PointerRNA;*/  /* view3d manipulators */
  
  void transform_keymap_for_space(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap, int spaceid);
  void transform_operatortypes(void);
diff --cc source/blender/editors/space_view3d/view3d_intern.h
index 6e12296,95c0ef9..b7170be
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@@ -46,10 -45,7 +45,9 @@@ struct bAnimVizSettings
  struct bContext;
  struct bMotionPath;
  struct bPoseChannel;
- struct bScreen;
  struct Mesh;
 +struct SimDebugData;
 +struct Strands;
  struct wmNDOFMotionData;
  struct wmOperatorType;
  struct wmWindowManager;
diff --cc source/blender/windowmanager/WM_api.h
index 52f106a,e64d08f..0ccc388
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@@ -54,14 -53,8 +54,13 @@@ struct wmEvent
  struct wmEventHandler;
  struct wmGesture;
  struct wmJob;
- struct wmNotifier;
  struct wmOperatorType;
  struct wmOperator;
 +struct wmWidget;
 +struct wmWidgetGroup;
 +struct wmWidgetMap;
 +struct wmWidgetGroupType;
 +struct wmWidgetMapType;
  struct rcti;
  struct PointerRNA;
  struct PropertyRNA;