Blender Git Loki

/source/blender/blenkernel/BKE_object.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_shader_fx.h (+3, -19) (Diff)
/source/blender/blenkernel/intern/object.c (+23, -1) (Diff)
/source/blender/blenkernel/intern/shader_fx.c (+0, -12) (Diff)
/source/blender/editors/include/ED_object.h (+0, -2) (Diff)
/source/blender/editors/object/object_add.c (+4, -0) (Diff)
/source/blender/editors/object/object_intern.h (+0, -2) (Diff)
/source/blender/editors/object/object_ops.c (+0, -1) (Diff)
/source/blender/editors/object/object_shader_fx.c (+0, -52) (Diff)
/source/blender/shader_fx/intern/FX_shader_blur.c (+0, -1) (Diff)
/source/blender/shader_fx/intern/FX_shader_flip.c (+0, -1) (Diff)
/source/blender/shader_fx/intern/FX_shader_light.c (+0, -1) (Diff)
/source/blender/shader_fx/intern/FX_shader_pixel.c (+0, -1) (Diff)
/source/blender/shader_fx/intern/FX_shader_swirl.c (+0, -1) (Diff)
/source/blender/shader_fx/intern/FX_shader_wave.c (+0, -1) (Diff)