Commit: 4f4e8b8027bbf64d7ca326d67318cebf23ea5672 Author: Nick Wu Date: Tue Jul 10 21:41:25 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB4f4e8b8027bbf64d7ca326d67318cebf23ea5672
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr mmit 9050f40fc00b6029a018c445eef66503031807dd. =================================================================== =================================================================== diff --cc source/blender/makesrna/intern/rna_internal.h index db68d5337fc,a57777f0630..092c528c390 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@@ -155,10 -155,9 +155,10 @@@ void RNA_def_fcurve(struct BlenderRNA * void RNA_def_gpencil(struct BlenderRNA *brna); void RNA_def_image(struct BlenderRNA *brna); void RNA_def_key(struct BlenderRNA *brna); - void RNA_def_lamp(struct BlenderRNA *brna); + void RNA_def_light(struct BlenderRNA *brna); void RNA_def_lattice(struct BlenderRNA *brna); void RNA_def_linestyle(struct BlenderRNA *brna); +void RNA_def_lanpr(struct BlenderRNA *brna); void RNA_def_main(struct BlenderRNA *brna); void RNA_def_material(struct BlenderRNA *brna); void RNA_def_mesh(struct BlenderRNA *brna); _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
