[Bf-blender-cvs] [b47883a990e] temp-lanpr-review: Merge remote-tracking branch 'origin/master' into temp-lanpr-review

[YimingWu]

Commit: b47883a990ee68e659a8a8b44729be9b8e0d002f
Author: YimingWu
Date:   Sat Feb 1 10:25:32 2020 +0800
Branches: temp-lanpr-review
https://developer.blender.org/rBb47883a990ee68e659a8a8b44729be9b8e0d002f

Merge remote-tracking branch 'origin/master' into temp-lanpr-review

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



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

diff --cc source/blender/editors/space_view3d/CMakeLists.txt
index 4542845f90c,95d7f79f666..193be7567bc
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@@ -95,12 -95,8 +95,12 @@@ if(WITH_FREESTYLE
    add_definitions(-DWITH_FREESTYLE)
  endif()
  
 +if(WITH_LANPR)
 +  add_definitions(-DWITH_LANPR)
 +endif()
 +
- if(WITH_MOD_SMOKE)
-   add_definitions(-DWITH_SMOKE)
+ if(WITH_MOD_FLUID)
+   add_definitions(-DWITH_FLUID)
  endif()
  
  blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --cc source/blender/makesrna/intern/makesrna.c
index e02376cdcdc,9b38ca8009c..50344cff3c3
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@@ -4239,8 -4238,8 +4238,9 @@@ static RNAProcessItem PROCESS_ITEMS[] 
      {"rna_lattice.c", "rna_lattice_api.c", RNA_def_lattice},
      {"rna_layer.c", NULL, RNA_def_view_layer},
      {"rna_linestyle.c", NULL, RNA_def_linestyle},
 +    {"rna_lanpr.c", NULL, RNA_def_lanpr},
      {"rna_main.c", "rna_main_api.c", RNA_def_main},
+     {"rna_fluid.c", NULL, RNA_def_fluid},
      {"rna_material.c", "rna_material_api.c", RNA_def_material},
      {"rna_mesh.c", "rna_mesh_api.c", RNA_def_mesh},
      {"rna_meta.c", "rna_meta_api.c", RNA_def_meta},